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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -418,7 +418,7 @@ var renew = {
                 pId = 1014
                 break;
             }
-            if(size.period.indexOf('月') > -1) {
+            if(size.period.indexOf('月') > -1 && size.period.indexOf('个月') == -1) {
               size.period = size.period.replace('月', '个月')
             }
             sizeTime = size.period

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -85,7 +85,7 @@
                                    placeholder="请输入合作需求，从而创造并匹配更多合作交流机会"></van-field>
                     </div>
                 </div>
-                <div class="form-tick-group" @click="isRead = !isRead">
+                <div class="form-tick-group" @click="isRead = !isRead" v-if="moduleShow.agree">
                     <div class="more-icon-box">
                         <i class="j-icon base-icon icon-tick-circle" v-show="!isRead"></i>
                         <i class="j-icon base-icon icon-tick-circle-fill" v-show="isRead"></i>
@@ -526,7 +526,8 @@
         companyType: true,
         company_size: false,
         workScope: true,
-        partnerNeeds: true
+        partnerNeeds: true,
+        agree: true,
       }
     },
     created() {

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -17,8 +17,8 @@
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/css/vip-size-template.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/css/vip-coupon-template.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/coupon/css/pay-order-template.css?v={{Msg "seo" "version"}}' />
-  <script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
-    <script>new VConsole()</script>
+  <!-- <script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
+    <script>new VConsole()</script> -->
   <style>
     .vip_purchase {
       height: 100%;
@@ -1387,7 +1387,7 @@
               pId = 1014
               break;
           }
-          if(size.period.indexOf('月') > -1) {
+          if(size.period.indexOf('月') > -1 && size.period.indexOf('个月') == -1) {
             size.period = size.period.replace('月', '个月')
           }
           sizeTime = size.period

src/jfw/modules/bigmember/src/entity/portraitBuyerSearch.go

@@ -423,8 +423,7 @@ func BuyerPortraitSearch(buyer string) (map[string]interface{}, error) {
 		}
 	}
 	go func() {
-		bytes, _ := json.Marshal(returnData)
-		fmt.Printf("BuyerPortraitSearch: %s spend time %fs\n	doSearchSql: %s\n	searchFormatResult %s\n", buyer, time.Since(tBegin).Seconds(), doSearchSql, string(bytes))
+		fmt.Printf("BuyerPortraitSearch: %s spend time %fs\n	doSearchSql: %s\n", buyer, time.Since(tBegin).Seconds(), doSearchSql)
 	}()
 	return returnData, nil
 }
@@ -596,8 +595,7 @@ func GetWithEntPortraitData(listDataItf interface{}, province string) (map[strin
 		returnData["withEstablishData"] = establishData
 	}
 	go func() {
-		bytes, _ := json.Marshal(returnData)
-		fmt.Printf("GetWithEntPortraitData: spend time %fs\n	doSearchSql: %s\n	searchFormatResult %s\n", time.Since(tBegin).Seconds(), doSearchSql, string(bytes))
+		fmt.Printf("GetWithEntPortraitData: spend time %fs\n	doSearchSql: %s\n", time.Since(tBegin).Seconds(), doSearchSql)
 	}()
 	return returnData, thisProvinceWinnerCount, nil
 }

src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -422,8 +422,7 @@ func GetWinnerPortraitSearch(entId string) (map[string]interface{}, error) {
 		returnData["rate"] = rataMap
 	}
 	go func() {
-		bytes, _ := json.Marshal(returnData)
-		fmt.Printf("WinnerPortraitSearch: %s spend time %fs\n	doSearchSql: %s\n	searchFormatResult %s\n", entId, time.Since(tBegin).Seconds(), doSearchSql, string(bytes))
+		fmt.Printf("WinnerPortraitSearch: %s spend time %fs\n	doSearchSql: %s\n", entId, time.Since(tBegin).Seconds(), doSearchSql)
 	}()
 	return returnData, nil
 }

src/web/staticres/common-module/coupon/js/coupon-template.js

@@ -36,7 +36,7 @@ Vue.component('coupon-list', {
               mold == 4 && item.lotteryAttribute == '满减券' ? 'reduce-opacity' : '']"
             >满@@item.full@@元可用</span>
           </div>
-          <div class="use-time">@@item.lotteryBeginDate@@ - @@item.lotteryEndDate@@<span v-if="expireDays(item.lotteryEndDate)" class="expire-time">@@expireDays(item.lotteryEndDate)@@</span></div>
+          <div class="use-time">@@item.lotteryBeginDate@@ - @@item.lotteryEndDate@@<span v-if="expireDays(item.lotteryEndDate) && mold == 4" class="expire-time">@@expireDays(item.lotteryEndDate)@@</span></div>
         </div>
         <div :class="['use-btn', 
           mold == 4 && item.lotteryAttribute == '折扣券' ? 'dis-bg' : '', 

src/web/staticres/js/pc-collect-user-info.js

@@ -118,7 +118,7 @@ var temp = `
                 </div>
               </div>
             </div>
-            <div class="agree-service">
+            <div class="agree-service" v-if="moduleShow.agree">
               <el-checkbox v-model="form.agreeChecked">&nbsp;我同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看</el-checkbox>
             </div>
             <div class="dialog-footer">
@@ -339,7 +339,8 @@ var vm = new Vue({
         companyType: true,
         scale: false,
         business: true,
-        need: true
+        need: true,
+        agree: true,
       },
       sourceTitleMap: {
         ent_portrait_: '请完善个人信息，免费试用企业画像分析，透视企业！',

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -406,7 +406,6 @@ var renew = {
             $('.vip-footer.renew .confirm').prop('disabled', true)
             var upgrade = renew.buyInfo.buyset.upgrade
             var size = JSON.parse(JSON.stringify(goodsSize.props.defaultSize))
-            console.log(size,goodsSize.props.defaultSize, '111')
             var sizeTime = ''
             var pId;
             if (size && size.period) {
@@ -421,7 +420,7 @@ var renew = {
                   pId = 1014
                   break;
               }
-              if(size.period.indexOf('月') > -1) {
+              if(size.period.indexOf('月') > -1 && size.period.indexOf('个月') == -1) {
                 size.period = size.period.replace('月', '个月')
               }
               sizeTime = size.period

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -96,7 +96,7 @@
                                    placeholder="请输入合作需求，从而创造并匹配更多合作交流机会"></van-field>
                     </div>
                 </div>
-                <div class="form-tick-group" @click="isRead = !isRead">
+                <div class="form-tick-group" @click="isRead = !isRead" v-if="moduleShow.agree">
                     <div class="more-icon-box">
                         <i class="j-icon base-icon icon-tick-circle" v-show="!isRead"></i>
                         <i class="j-icon base-icon icon-tick-circle-fill" v-show="isRead"></i>
@@ -537,7 +537,8 @@
         companyType: true,
         company_size: false,
         workScope: true,
-        partnerNeeds: true
+        partnerNeeds: true,
+        agree: true,
       }
     },
     created() {

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -1344,7 +1344,7 @@
                           pId = 1014
                           break;
                       }
-                      if(size.period.indexOf('月') > -1) {
+                      if(size.period.indexOf('月') > -1 && size.period.indexOf('个月') == -1) {
                         size.period = size.period.replace('月', '个月')
                       }
                       sizeTime = size.period