Merge branch 'dev4.6.2.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.4

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -212,6 +212,10 @@
                 level_map.set(3, niche);
                 level_map.set(4, trial);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 var member_endtime = "-";
                 $(".o-name").text("大会员")
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -554,8 +554,9 @@
                             <div style="position: absolute;top: 50%;left: 50%; margin-left: -100px;width: 200px;height: 26px;color: antiquewhite;font-size: 16px;">想中标？提前介入很关键!</div>
                         </div>
                         <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 20px;">
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 5px">提前获取正在审批中的新项目,比招标信息更超前!</div>
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">拟建项目抢先获知,提前获取正在审批中的</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">新项目，比招标信息更超前!</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
                             <button class="free-btn-reword" style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
                         </div>
                     </div>

src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -200,6 +200,16 @@ var assetsConf = {
       5: {
         wx: '/order/image/dahuiyuan1.png',
         app: '/jyapp/big-member/image/dahuiyuan1.png'
+      },
+      // 商机版2.0
+      6: {
+        wx: '/order/image/dahuiyuan2.png',
+        app: '/jyapp/big-member/image/dahuiyuan2.png'
+      },
+      // 专家版2.0
+      7: {
+        wx: '/order/image/dahuiyuan1.png',
+        app: '/jyapp/big-member/image/dahuiyuan1.png'
       }
     }
   },
@@ -256,6 +266,16 @@ var assetsConf = {
       5: {
         wx: '/order/image/zizhanghao1.png',
         app: '/jyapp/big-member/image/dahuiyuan1.png'
+      },
+      // 商机2.0
+      6: {
+        wx: '/order/image/zizhanghao2.png',
+        app: '/jyapp/big-member/image/zizhanghao2.png'
+      },
+      // 专家2.0
+      7: {
+        wx: '/order/image/zizhanghao1.png',
+        app: '/jyapp/big-member/image/zizhanghao1.png'
       }
     }
   },

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1851,7 +1851,9 @@ var vm = new Vue({
         2: '智慧版',
         3: '商机版',
         4: '试用版',
-        5: '自定义'
+        5: '自定义',
+        6: '商机版2.0',
+        7: '专家版2.0'
       }
 
       var levelInfo = {

src/web/templates/pc/member_orderDetail.html

@@ -157,6 +157,8 @@
                     level_map.set(3, "商机版");
                     level_map.set(4, "试用版");
                     level_map.set(5, "自定义");
+                    level_map.set(6, "商机版2.0");
+                    level_map.set(7, "专家版2.0");
                     if (filterObj.free_sub_num){
                       $(".free_num").text(filterObj.free_sub_num+"个");
                     }else{

src/web/templates/pc/myOrder.html

@@ -611,6 +611,12 @@
                 },
                 '自定义': {
                   icon: '/order/image/dahuiyuan1.png'
+                },
+                '商机版2.0': {
+                  icon: '/order/image/dahuiyuan2.png'
+                },
+                '专家版2.0': {
+                  icon: '/order/image/dahuiyuan1.png'
                 }
               }
             },
@@ -657,7 +663,9 @@
             2: '智慧版',
             3: '商机版',
             4: '试用版',
-            5: '自定义'
+            5: '自定义',
+            6: '商机版2.0',
+            7: '专家版2.0'
           },
           list: [],
           ind: 0,

src/web/templates/weixin/member/memberdetail.html

@@ -200,6 +200,10 @@
                 level_map.set(3, niche);
                 level_map.set(4, trial);
                 level_map.set(5, custom);
+                niche.set("level", "商机版2.0");
+                level_map.set(6, niche);
+                expert.set("level", "专家版2.0");
+                level_map.set(7, expert);
                 $(".o-name").text("大会员")
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))
                 var member_endtime = "-";