优化功能

src/app.js

@@ -18,7 +18,7 @@ App({
    wx.setStorageSync('reLoginErr', false)
     try {
       this.isFromQiyeConsoleIn(e);
-      this.checkForUpdate();
+      
       let res = wx.getSystemInfoSync(); // 获取当前运行环境
       config.pixelRate = res.windowWidth / 750;
       config.platform = res.platform;
@@ -83,6 +83,9 @@ App({
   },
 
   onShow: function (options = {}) {
+    //检查是不是有更新
+    this.checkForUpdate();
+
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
     // 获取当前会员是否是体验者
     const { member } = baseUserInfo

src/component/personCenter/personCenter.js

@@ -68,7 +68,7 @@ Component({
     },
   },
   attached() {
-    console.log("isvip", this.data.isVip)
+    // console.log("isvip", this.data.isVip)
     const { imageUrl } = app.globalData
     const { personData, isVip } = this.data
     this.setData({
@@ -94,6 +94,7 @@ Component({
     },
     _userInfoChange(newVal, oldVal) {
       if (newVal !== oldVal) {
+        // console.log(newVal)
         this.setData({
           memberActivateStatus: newVal && newVal.memberActivateStatus || false,
           memberCardNo: newVal && newVal.memberCardNo || '',

src/config/index.js

@@ -57,6 +57,15 @@ const needMock = '' //
  * contactUspluginId = a6ea55b56eb09ced8f9aeeaa14383b52 联系我插件id
  */
 
+/**
+ * 多多一上 生产环境配置
+ * appId = wxf7bc302c51166dc0  //小程序 appId
+ * tunnel-token =  //token 杨辰提供
+ * brandId= 2007 //商户Id
+ * contactUspluginId =  联系我插件id
+ */
+
+
 
 // appid_dev_wx   wxc3b64b09b1d3dfc2 
 // appid_test_wx  wx857ea77f4f7f4f34//  wxac09792264c49b5c // 1002商城
@@ -121,6 +130,8 @@ const envInfo = (() => {
     appId: appId[PROJECT_ENV],
     brandId: 3001,// 1001 1002 3001 3002 //2711 711生产brandId,
     plusIsOpen : true, //是否开启plus
+    contactUsPluginId: '766c50920993bf9c41c6c3d2761a2df5',
+    contactUsIsOpen : true,//是否开启联系我
   }
 })()
 

src/pages/cart/cart.wxss

@@ -228,10 +228,11 @@ page{
 }
 .empty{
   color: #808080;
-  text-align: center;
   width: 100%;
-  margin-top: 458rpx;
-  
+  margin-top: 350rpx;
+  display: flex;
+  flex-direction: column;
+  height: 320rpx;
 }
 .empty-img{
   margin: 0 auto;

src/pages/couponCodeDetail/couponCodeDetail.js

@@ -24,9 +24,6 @@ wxService.page({
     })
     // 条形码
     if(cardno){
-      setTimeout(()=> {
-        wxbarcode.barcode('barcode', cardno, 600, 180);
-      }, 200)
       this.getCouponDetail(cardno)
     }
   },
@@ -54,6 +51,12 @@ wxService.page({
         },()=> {
           wx.hideLoading()
         })
+
+        // 重新渲染条形码
+        wxbarcode.barcode('barcode', this.data.cardno, 600, 180);
+        setTimeout(() => {
+          wxbarcode.barcode('barcode', this.data.cardno, 600, 180);
+        }, 200)
       } else {
         wx.hideLoading()
         wx.showToast({

src/pages/memberOfOwn/memberOfOwn.js

@@ -5,6 +5,22 @@ const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo
 var wxbarcode = require('../../codeUtils/index.js');
 var count = 0;
+const COLOR_OBJ = {
+  Color010: '#63B359',
+  Color020: '#2C9F67',
+  Color030: '#509FC9',
+  Color040: '#5885CF',
+  Color050: '#9062C0',
+  Color060: '#D09A45',
+  Color070: '#E4B138',
+  Color080: '#EE903C',
+  Color081: '#F08500',
+  Color082: '#A9D92D',
+  Color090: '#DD6549',
+  Color100: '#CC463D',
+  Color101: '#CF3E36',
+  Color102: '#5E6671',
+}
 
 wxService.page({
   /**
@@ -33,6 +49,14 @@ wxService.page({
       }
     ],
     index: 0,
+    cardStyle : {
+      bgColor : '',
+      bgUrl : ''
+    },
+    cardNoOffline : '',
+    qrCardNo : '',
+    membershipCardnoType: '1', ////1 舞象会员卡号 2 关联实卡号
+    codeType: '',//CODE_TYPE_QRCODE 二维码  //CODE_TYPE_BARCODE 条形码  ///CODE_TYPE_TEXT 仅展示卡号
   },
   bindPickerChange(e) {
     this.setData({
@@ -44,10 +68,77 @@ wxService.page({
    */
   onLoad(options) {
     wx.hideShareMenu();
-    const { memberCardNo, memberId } = wx.getStorageSync('_baseUserInfo')
+    const { memberCardNo, memberId , member} = wx.getStorageSync('_baseUserInfo')
     // if(memberCardNo){
 
     // }
+    if (member){
+      this.data.cardNoOffline = member.cardNoOffline;
+    }
+  },
+  //获取会员卡面设置
+  getMemberCardSetting(){
+    wxService.post(`/member/cardSetting/getByBrandId`).then(res => {
+      let obj = res.data.data ? res.data.data.cardStyle : {};
+      if (obj.backgroundPicUrl){
+        this.data.cardStyle.bgUrl = obj.backgroundPicUrl;
+        this.data.cardStyle.bgColor = '';
+      }
+      else if(obj.color){
+        this.data.cardStyle.bgUrl = '';
+        this.data.cardStyle.bgColor = COLOR_OBJ[obj.color];
+      }
+      else{
+        this.data.cardStyle.bgUrl = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/711_08.png';
+        this.data.cardStyle.bgColor = '';
+      }
+
+      let tempObj = res.data.data ? res.data.data : {};
+
+      this.data.membershipCardnoType = tempObj.membershipCardnoType ? tempObj.membershipCardnoType : 1;
+      this.data.codeType = tempObj.codeType ? tempObj.codeType : 'CODE_TYPE_BARCODE';
+      // this.data.codeType = 'CODE_TYPE_TEXT';
+      // this.data.codeType =  'CODE_TYPE_QRCODE';
+      // this.data.codeType = 'CODE_TYPE_BARCODE';
+      if (this.data.membershipCardnoType == 1){
+        //舞象会员卡号
+        this.data.qrCardNo = this.data.memberCardNo;
+      }
+      else{
+        //三方实体卡
+        this.data.qrCardNo = this.data.cardNoOffline;
+      }
+
+      // this.data.qrCardNo = this.data.memberCardNo;
+
+      this.setData({
+        qrCardNo: this.data.qrCardNo,
+        membershipCardnoType: this.data.membershipCardnoType,
+        codeType: this.data.codeType,
+        cardStyle: this.data.cardStyle
+      },() => {
+        if (this.data.codeType == 'CODE_TYPE_QRCODE'){
+          this.generateQrcode();
+        }
+        else if (this.data.codeType == 'CODE_TYPE_BARCODE'){
+          this.generateBarCode();
+        }
+      });
+    })
+  },
+  //生成条形码
+  generateBarCode(){
+    wxbarcode.barcode('barcode', this.data.qrCardNo, 500, 120);
+    setTimeout(() => {
+      wxbarcode.barcode('barcode', this.data.qrCardNo, 500, 120);
+    }, 200);
+  },
+  //生成二维码
+  generateQrcode(){
+    wxbarcode.qrcode('qrcode', this.data.qrCardNo, 300, 300);
+    setTimeout(() => {
+      wxbarcode.qrcode('qrcode', this.data.qrCardNo, 300, 300);
+    }, 200);
   },
   //微信支付
   onTapWxPay() {
@@ -159,15 +250,13 @@ wxService.page({
           data.member.sex = 2
         }
         this.setData({
+          cardNoOffline: data.member.cardNoOffline,
           memberInfo: data.member,
           index: data.member.sex,
           date: data.member.birthday
+        },() => {
+          this.getMemberCardSetting();
         })
-
-        wxbarcode.barcode('barcode', this.data.memberCardNo, 500, 120);
-        setTimeout(() => {
-          wxbarcode.barcode('barcode', this.data.memberCardNo, 500, 120);
-        }, 200);
         // this.setInternal();
       }
     })

src/pages/memberOfOwn/memberOfOwn.wxml

 <!--pages/userCenter.wxml-->
 <view class='page-memberOfOwn'>
 	<view class='own-content'>
-		<view class='user-info'>
+		<view class='user-info' 
+    style='background-image:url({{cardStyle.bgUrl}});background-color:{{cardStyle.bgColor}}'
+    >
 			<view class="user-avatar">
 				<open-data type="userAvatarUrl" />
 			</view>
@@ -15,10 +17,21 @@
 				<image src='/assets/imgs/711_11.png' bindtap='handleGoWxCard' />
 			</view>-->
 		</view>
-		<view class='user-qr-code'>
+    <!-- 条形码 -->
+		<view class='user-qr-code' wx:if="{{codeType == 'CODE_TYPE_BARCODE' && qrCardNo}}">
 			<canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
+      <view class='card-no'>{{qrCardNo}}</view>
 		<!--	<view class='wx-pay-code' bindtap="onTapWxPay">微信支付</view>-->
 		</view>
+    <!-- 二维码 -->
+    <view class='u-qr-code' wx:if="{{codeType == 'CODE_TYPE_QRCODE' && qrCardNo}}">
+      <canvas canvas-id="qrcode" binderror="canvasIdErrorCallback" />
+      <view class='card-no'>{{qrCardNo}}</view>
+    </view>
+    <!-- 仅展示卡号 -->
+    <view class='u-qr-code' wx:if="{{codeType == 'CODE_TYPE_TEXT' && qrCardNo}}">
+      <label>{{qrCardNo}}</label>
+    </view>
 	</view>
 
 	<view class="form-info">

src/pages/memberOfOwn/memberOfOwn.wxss

@@ -21,8 +21,9 @@ page{
   box-sizing: border-box;
   background-repeat: no-repeat;
   background-position: center;
-  background-size: 100% 100%;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAosAAAEkCAYAAABHSHuxAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAIfFJREFUeNrs3emPndd9H/DzjGRLtqSh7SheS9qWKjUqx0sb20FJp83yphKK5EUClASKIOgb6l1e1J30DzBToAgCFBoVLRqgbWgEdRrLErXYcmxZO63VWqiNO0WL+77NUKR4O3e46fLeO/d5nnue7d7PB6BlUbOcOXOe53zveX73nKTVaoV+vvfd3/vyTdef/6Mbrz//Lz9yTeuTAWJL8nxSK+PXaQ38uGSodreGa39SUh8t+rVaQ3yvIfsoydD+YfspifD7ytJPSdpPa2X82VqRxknOPkoi/L4ytDlJWnHGf7TrrRX158t73+r6+KSIa3fIe26sPopxz01SfptRvude9f1OnPzohhMnr334j//k9ScW/dK9wuIDf/k737nl18985/ZPn/qMNEN5oTFCoEjy3zCSoibMJMXNJVXQaWW8WZRwA5tvU5K6TUP258BvlKHtFY+3pKbXQKjqGogZGnO/SCl6vA15j0jbprQvUIy3wd+mhtdAtnkgfVsOH/34BxvfufmR3fs+/mer//1r2xcNi+2VxK8tnd0gJCI0Rgw5WdqeRLhRDL0ykC/ERgmNMfooywqL0FhO0I843pLM10DdxpvQWMp4S9P2NKExV5tqsHAwRGjc8NLn/9O/+bdv/mXPsNgOit++7cSbn5s8c73EQvWBseibfIZH02kfXca6WRQWGou/gSVl/X5jP5ZLih5vGUNjTa6BUNU1ULfQWMh4K+GavKpNSc3vuXUdb0nZbYq5yphzvD32zJf/z+//4Tt/2hEWBUXqGxqLruWKHBpjPpqOFRpr/Wi6RpN4xeOt8lXGWJP4SD2aLnq8lREau/szqek1UPfxltT0GghJMSH2x4/f9h/u/OM3/qr9/yfa/7Ps187+jaBI7bTHcytZ/Ipp9RrtSY+vs9gVlCx6/bSytqc1oD2Ltumqjx90D2i3p5Wk6McIbWqle2Hdbk+r/Sd1m7L0Z+jun4FtSlK2u9rx1vPTBrWpVc41EKq4BlKOt9bF8RYaOd4GtKmVYuYf2Kakq019P6Um99y6jrdWTa+BgXNAzvH2ra+/918e+L9f/+JCWPz+f/69f/VbXzr2bcmExobGmBNmn49pXR0aQ8SbxdCTQZ6bxRATVJbQmLpNQ05QaSbMVqTQWPB4Kzw0hnzXQPfXyXMNFDfeWpmugbqNt0gvLDO2KXdoLOGeW9fx1vpwaAx5XqgXdA2kWTjION4+9YnT13zm5hN/sxAWP/eJs9+VRmhMaAxlTJhhcGhsRbxZxJoMMt8shpygYq0ypp3E0/x+U636ZJjEKxxvfUNjrjaF9OMo7QSV6xoodrylWmWs9XiLFBoztqkV/RoIUa6BysfboNCYZpWxgntu6nkgRXtu//LBFQthcdmn5r4hhdCowDjohtFa5IaU5RXvgNCY6hV4zzbV4NF0rDbFfDSd5gaWZhLP8qiwFWm8tYobb60o10DFjwpLHm+ZQmMtx1vePgq527T4KmPJ461Vk/GWYvxnDo0l3nNDa/gQ+8nJ2Wvv/avfuXVCrSLNDY3V1nK1QoX1jLEeS1RRzzjoQ0urL+uu5RpqghrlesbUQad+9YzpX4DWbbwNaFOsR9Ohho+mQ2huPWMYvXrGJDk/NSF1IDSGoWq54tQzpp0Mcqwg1K2e8WKIHft6xhzjrVn1jPUYb1EfTVcy3oZ8YZmzTaWExhEbb1dWGet1DQxdz9hq3SAsMjqhseJaruHqGQueDJpezxjy/n7rVs8YZ7wtXs8YKrsGMq36lDzeSn00Xch4i3SfyNimwfWMxlv/0Fifx+WZ54EPff3z8xeOsMhoBcYa1HKpZyxjq52cIa2KesYCx1vmVcaSroFQxTVQ6FY7dRpvQ6xC5WzTSG21U+J4Sx0aq3g0neEaOH9eWGRkQ2PNttqpYz1j6vA9TJtCdfWMg0J1WfWMTd9qp9KtT4obb9HrGUsdb5FeWDaxnrGB9bOF1DOGOPfctONNWERoTHMDS3NDTV3PmDWgFbSCkOvRdNY25XtTTmO32qljPWPF2031/p3VY7xVstVOHesZM14D6hmzj//o9YxlvhEyCIuMS2isuLams56xxNqa2KExRGhTY7fayVrPWM14y73VToHb/2Re9Sl5vI19PWPOa2Dk6hlLGG9NrWcUFhmfwNi0owNj3izS3DAcHTjeRweWdA1kbo96xnrWMw76FONt8K29QfWMwiJCY9ZVgbQ3sCqODoyxWa+jAx0d2OR6xgjjTT1jCI4OLH68dR8dWJ/jM6+eB4RFxjc0juLRgSE0d6udFCHW0YH5xttY1TNGGm+NPzqwwnrGut5z6zre8tczlvdoWlhkvANjDWq5ctUzhgg3i9ihMUabHB3YgKMD418DqVehKhhv9Tw6sI71jCHe0YFjWj9b26MDhUUIzaxnjLnVTppJ09GBjg5Uz5ijnrGo8RZC8UcHDn8NqGfMN97qWM8oLEIVE6ajAx0dOOr1jCHfNdD9depVy+XowBBG/+jA6sdbdz1jtfdcYRGy3jDSPCZJdQMLjg50dOCI1TOG9OOo0PqyGj2armX9bKT7RMY2xa9nHP3xlvnRdEFtEhYh7w0j9mOSxY5zc3RgjY4OrLCeMQwzYZZRz+jowMJepBS61U6BuyvErmcc0/FWdT2jsAjD3DBKqOVqxNGBo17PONSEWdOjA0No7lY7NaxnTP8CNIR61c8OaJOjA0f/6MBBx2cKi1BBaExzQ1XPuHib6np0YB3rGXOMt2bVM9ZjvEV9NB2CowONt8W/TclbrgmLkDU0VlxbMzL1jCFCm9Qzlnt0YJpJs65HudWxnrGW4y1CHzk6sJ71jEPcc4VFyBMYa1Bb4+jAOtYzpp2cQii2ntHRgYVdA44OdHRgDesZi35cLizCUKGxZlvt1LGeMXX4TtGmYVYFPhwaQ1H1jEUf5ebowMGzZom1XI4OTPfC0tGBhY+34Y8OXPyeKyxCnUJjmpt86nrGrAGtoBWEXFvthFDGm3Iae3RgHesZR/EotxCae3TgqNczGm/9v00BxxkKixAzNFZcW5Pr6ED1jDU7OjBrPWM14y33VjtjepRb5tA47Hgr4kVKjD7K8bjc0YHZx1vsekZhEWIHxqYdHRjzBpZmghqZesacE1T0o9wadnRgSddA5vY4OjDleBvQJkcHjuTRgcIiVBEaG3N0YI7awbQTVN222rkUGlO3ydGBQ4XGxtSXFTfebLUT1DOWUK89fD2jsAjFh8aKa2uG22onBEcHDjGJOzqwFsdn9v6dlTTe6ljPGHW8RQqNGdvUquk1MPx4C4WNt2HqGYVFKCMw1qC2Jlc9Y5pXvON8dGCaCTPNBFXFVjsFjrdaHB2onjHCeEtKODow/zUQ9+jAENQz9m+TsAilhsaG1TM6OjD+VjulHuXWsHrGVlDPqJ6xmUcHNnC8ZVk8EBahbqGxMfWMRU0GYbSPDkwT0tQzVnSUm3rGOONtyBeWOdvUvKMDqx9v3fWMwiLULzRWXMs1MkcH1rGeMeT9/db46MAhxlth9YxRj3Ir8Rqw1U6D6hlHf7wNejQtLELVgdHRgQMDWiPrGR0dWN96xoF9NI5HBxZZPzugjxYLXTnbFLeecbyODuwVGoVFqE1odHTgwNCYOnwP06bg6MCCa7kas9VODesZs10DQ7zBo5CjA0Mo/NF0aPBWO3WsZ7R1Dox4aExzQx3nowNDaO7RgXWsZ8wx3ppVz1jCNeDowGqODjTe+n+bU9eFb+5aese1ZmeoaWhMkjDwuXFy9Q2gNeBjenx8n4+7/NeXbl5JGHxnufx1ktB3Salnm676+EFtvzRZJileHid9vkeWNrUG378vB8b5NiWp2pT0v6P3/f1e1UfJoAnz4gcmacdb1vbEGW89f5QaXANdE3hZ10CK8XYpMCapr4G6jbcIfRSyt6nvj2G8dbd2wx0h+bvfDv/oullhEWodGAfdMFoDbvADb2CDbxiX/zrLDSxGQEszQaUJjV3fK2ebWq0Uk1PK0JjmJp9mgko9YaZo++WvlVQy3np+Wk2ugVyTeEnjLVVorPV46xG6Fn0VMUSbkgGfYrxd+HbtkPjQt0I4dNOFv7tuNgiL0PTQmGZVIO0NrM9NvuNTB61CxQxoaVcQ2hNmmhWWtG1KhlgV+HBovNim9KEx5wSVakUjdEyYdR1vuUJjCddA71WoSNdAhPHWDo1JpmugTuNtkf6M9TSizypjrtDY9PHWpz+TV78ckv/37RAOT3Z9eWERmhQakyEfJS06OWUIjWlWofrewApaQcjyaHpQm2KG2IV/pHg0HSL8fmM/Kow1YeYYb31DYynXQNpHhZGugUjjLdOj6VqOt0ihMcej6b6hcRTH21VtSjZ9PiQPfyuEzZ/v+2WFRWhaYBx0w6hrPWPMR9OxQuMo1jPmrOUa/CKlmvHW6hUYC78GMvRn2ddA3eoZCxlvEfooVZs6X6T0rZ0d0fG2EBIf+WYImz4/cFAJi9DY0NiwesaYj6bTrCCMTD1jzgkqRy1XXcfbyNQzljze8tUz1mW8hRLqGbsfl49UPWO/8XboxjDxvd8NYfMXUk85wiKMcmhsej1jjOL23PWMOSaojPWMQz+aTjNB5ajlqut4G+16xuLGW7Z6xrqNt6CeMdZ4O3JTSB7+Rkieuz3zVCMswqiExoprawqpZ6zi0XTHikbOCSr2o+kQ6ldfVuF4i1vPmPZFSoaQlusaqNGj6VqOtyH7KGebBm+104DxNvvRkPxgRUievz3dPrXCIox4YBw0QbX63VDj1dZUXs847KPpWG2K+Wg6zYSZZhKvYqudQRPmEOMtdz2jrXZqVs+YZ6udrH2Uf/ufxVcZSx5vA0Pjh8ZbOyQ+/pWFP+3/PwxhEUYyNJb0mKSO9YwZ3qVcu3rGmFvtLBbSytxqp+CA1phH0zWsZ4y61U6p4y3kqGccfvufWjyaTvkiJfnxb86HxKmLITHfaqKwCEJjuVvtXP46JdVypV1BqFs9Y8ytdtKENPWMhV8D3b+PkrabKnurnUrGWxjdesac4y15/rb5oPjPQzh8Y+5HzsIijGtorPAot45PL7uWK03bm17POIpHB6aaMPPUMzrKbejQOIpHB+ZsU6H1jBnHW7L1cyH529+eD4k3FTKNCIswLoFxUEhzdGD60OjowFofHdjzyzvKrSZHB4ZQWT1jzKMDP5wfQ3X1jMmWz4bk0a+HsOVzhU4hwiKMXWis2VY7daxnjHl0YN82OTrQVjuh3OMzq6pnHOoNJxHrGWM+mr6qTaXXMx6+MST3fyskG5eVMnUIiyA0DncDi1rPOIJHBy46YWYMsaHkowMHTZiODoxTz1j28Zl1PTow6ngL9Ts6MMY1cPqjIVk/HxKfvzXEeOOKsAikC41NPDqwY/VgyMkgVmgcxaMDc06YdR1v1RwdmCGkjfvRgYWMtwh9FEIB9YwZx9vsR0Ly1B0hefKOEOauK32qEBZBYAyNOzow5oSZZoJydGDKCTPiNjKODhyBowOzhsYi62cXuQZi1zNGPjowefHWkDz61RCO3FjJFHHt9Wc/JiwC6W5gTT86sO+EORpHBy76oWVufXLp96uesX71jKUfHZjiRUqp4y00aqudZMtnQrL+GyHs+eSir5uLllxz/hphEcg2QTX16MC+bWrAVjtpQmwouZ6xcUcHhhrWMxZ1dGCfayDSeGv80YGxQmNRW+0cuSFMfH9FCNs+HcqsS1yMsAjkm6AKPsqtOzRW8Gg6VmgcxXrGnLVc1Y23xQNanKMD418DaVehqhhv9Tw6MMuLlBJeyGXZaqd9PN/PpkLy9D+JuqG2sAiUEBobVs8Yc6udNCsI6hnTT5iODlTPWLvxFkqoZxy81U7y04shcW64M5yFRaC+obHp9YyjeHTgpdDo6MARPzow6zVQ3HjLVs/o6MAFb34hTDz4zyp784qwCBQTGkexntHRgWNez5jn6MCsbSpqq51Q3vGZsR9N13K8DdlHadt0+IYw8fffDMn2Tzfi1i8sAtkD46AJqoRaLkcHFvBoOs2EmWYSr/zowLjjLU49o6MDmzXe8vbRgBeWcx8JEz9bHpJnbmvUbV9YBIYIjdXWcjXi6MBBobGKesbCjg5MOWH2antS7/HWmK12aljPGHWrnZ79WcHRgYuO/9CzTcmzt80HxX9a27pEYRFoRmiMenRg1gmzwM1661bP6OjA+Fvt1LKecQSPDuzZpnrXMybbfz0kD38tJHs/0djbvLAIxAuNFddyDVfPWKOtdmK0aWyODqxmvC1ez9iwowNLGm9jd3Rg+5HzI18NyS+/WOmm2sIiUL/AOCikOTowfWis9VY7OUNa5fWM8UshGn90YMnjbRyODpx47DdCsuEfLwTGUSAsAgWFxppttVPHesZcj6aztqmoowMXmTDTBCJHBxZ+DXT/Pko6PnOMjw5Mdtwckh99JSR7loS6nL4iLALjExqj1jOWUMuVZoLK9Wg6a5vG7OjAOtYzjuLRgZHGWyVb7QwKjXnqGduPnH80FZJXlo5USBQWgXJDY8W1XLmODuxY0ci6wpJhgnJ04OAQm6uesWFHBw7VJkcHVvUiJdlwS5h4/PZGvstZWATqFxibdnRgzAkzzQTl6MCUoXFEjw4s6RrI3J4Sx1uT6hmTvZMhuf/rIdm3pPFvYBEWgWaFxqYfHdh3wnR0YOpA5OjAwq+B7t9HScdnjkI9Y/uR8+O3heS5W8bmti0sAtWFxlE8OrBvmxqw1U6KEOvowFCDowPjXQO9f2clHJ9Z13rGAeMtefszYeKBr80HxvGKT8IiUG1gHDRBlVDLlaueMeaj6VihcazrGSNutVPgeItzdGD8a6Dz64xxPWO/Nh/9WJhY/9WQ7PxUGMU3sAiLQENCY8PqGWNutZNmVWMcjg5cLKSVudVOweOt8kfTY1XPOPx4S57/Uph4YnT2TBQWgdEOjY2pZ3R0YP82qWcsLTRGPTqwhGugkHrG/OMt2XdTSB78yvw/J8f+1iwsAvUMjcMe5ZZqwnR0oKMDw4jVMxZ1dGCJ10DsR9MhY1/OXRsmXvhiSJ681b1YWARqHxgHTVCxHxX2CY2ODgw1OzowhMrqGQusHYxTz+jowGFepCTvfjJMPDQVwrHr3YOFRaBZobHaWi5HB+YMjYUdHXjVxzf16MA61jOmDtb1q2ccaqud9mri07eE5IVlYRzfwDIwLL566Ca9UKVk5L5RLb99rgYmozJmktEYtz2XXNK2q9Vj0lrsc1IGoiRPf+VoexG/m1Lb1ErXrCTvx2TdEbmVsZ9aBbcn422olDZVcA2EFOMtxfcbGBqv+lo37bkhfOnxL4RrTozuCSzDON667ppr/+CVOwqePJICvmZBk32S8hOTDP8xifc9W6km0X7fI8nwsySDv26S9usN+FpJmt9dip91YHuS7J9/uc8X+f5Jku53mqT4nknKfkuSjJ+TdP5dms/p+T2SjkWFwT9Hn3b2/Pgs7ejxM/X6/KRPGxb5/q2B3/+qf2/1698kRZsL0or8cTCilpz9IMy8uC385u5jOmMR751Z8oHH0ADAWLlr95Ew89L2MPn+B8Fj58GERQBgLFxaTbxzzxEhUVgEALhi5cHjYd2GTWHy7HmdISwCAFyw5Oy5MP3Wr8Karft6FF0jLAIAY6u9mjjz0taw9PQZIVFYBAC4Yu3rO8KarXt6bHOAsAgAjK2pY6fCvS9vCcuPndYZwiIAwBXTb78bpt/ZdXE10YqisAgAMG/Z6bkw88vNYcXB4zpDWAQAuOKuvYfCzMubw+TZc8FqorAIALCgvSXO2o3bwqpd+7yJRVgEALhi6vjJsO65N8PS2TM6Q1gEALhi+p0dYXrTuzbYFhYBAK5oP3Ze98IbYcWho0KisAgAcMXK+YC47oWNYfLsBzpDWAQAuGJ60/b5PzvsnViRT50+d0xYBABqZ9nsXFj3wmth+fFTOqNCN5w5PyssAgC1ctfeA2Hm1bfsnVgTwiIAUBvTm7aF6c3bhURhEQDgioV3O7/06sV3OyMsAgBctPLQkYWgOHnOY2dhEQDgQ+7e/m747lvvCInCIgDAFe3HzjOvbwx37j2gM4RFAIArpo6fCPe+9npYfuJksKIoLAIAXHbXvn1h5rWN6hOFRQCATmvfeius2bnz4mksCIsAAPOWnDsb1r38clhx+IjOEBYBAK6YOnE8rPvly2Hp6dngsbOwCABw2V3794aZ118Lk+c+0BnCIgDAFdNbN4XpLZvDhdVEK4rCIgBAuFCfuPbtN8Kq3e/pDGERAKAzKK5/YUNYfuJ4sJooLAIAXNZ+I8v6F58Nk2fP6YwRM6ELAIBhrN6960JQPHdWZ4wgK4sAQG7TW98O09s2BY+dhUUAgA4zb7wcVu3eJSgKiwAAVyy8keWlpy++kYVRp2YRAEht6sSxi0HxmM4YE1YWAYD0QfHlp7zjecxYWQQABlq9Z+d8UHzSO57HkJVFAGBgULznzZcu/ps3swiLAAAXrd38aliza4uQKCwCAHSaeeuFsGrPuzpCWAQAuKK9Nc66158NK44cCFYUERYBgI6guP6Xj4flJ22NwwXeDQ0ALFg2d2o+KP58Pige1RlcZmURAAhT8wFx/Ss/D5Nn21vjePSMsAgAdATFx8LkOZtt081jaAAYYyuP7r8YFG22TW9WFgFgTK3euy3c887zIbQ8dqY/K4sAMLZB8TkdgbAIAFwVFPcJigiLAEDfoPgLHUFqahYBYExM73xt/s9GHYGwCAB0mtn0bFi1d3uwhyJZeQwNAOMQFPdt0xEIiwCAoIiwCACkDopbdQRDUbMIACMZFJ8Jq/ZbUWR4VhYBYOSC4tPzQdGKIsIiAHB1UNwsKCIsAgCCIsIiAJAtKG7REUTnDS4A0PSguOUpK4oUxsoiADTY6v2brSgiLAIAvYPiPVue0hEIiwDAVUHxgKCIsAgA9A2KT+oISuENLgDQqKC4yYoipbKyCAANMXXqUFi7/Rc6AmERAOgOiuvffChMfvC+zkBYBAAERYRFAGCAJfMBcd2mRwVFhEUAoDsorn/zwbD0zEmdQWW8GxoAahkUzywExeWnD+sMKmVlEQBqaO2OZ+eD4iEdgbAIAHSa2fbzsOrgOzoCYREA6HT33tcERYRFAKDb6oNvh++++4yOQFgEADqtPPFeuGfbYzoCYREA6DR1+mBYt/lHOgJhEQDo1N4iZ93mR2y6jbAIAHQHxfVv3x+Wvn9CZyAsAgCd1r77VFh++qCOQFgEAK4KirueDKsOva0jEBYBgE6rD74V1ux7VUcgLAIAnaZOHwj37PipjkBYBAA6LXv/eFi/6Qc6AmERAOi0sEXOlgdtkYOwCAB0W7vribB81jufERYBgKtM7/lFWHXoLR2BsAgAdLrr6NaFsAjCIgDQYWr2QJjZ+aiOQFgEADq139By745Hw+T8P0FYBAA6zOz8cVg+e0BHICwCAJ2m92wIdx7bqiMQFgGATitP7grTezfoCIRFAKDTsvePhXXbHtARCIsAQLd12+/3hhaERQCg29r3HvOGFoRFAKDb6sMbw5oDL+sIhEUAoNPU7P6FVUUQFgGADgsbb+96RJ0iwiIA0G3t7p+F5bP7dQTCIgDQ6a5jm8Oqwxt1BMIiANCpvZ/izK6HdQTCIgDQbd2O+9QpIiwCAN3W7v5pWD6nThFhEQC4ysqT74Y1B1/UEQiLAECnJR/MhXU7/15HICwCAN1mfvWQOkWERQCg290Hnw93Ht+sIxAWAYBOU3P7wvT+p3QEwiIA0O3eXz3o8TPCIgDQbXr/k2H53D4dgbAIAHTy+BmERQDo6cI2OX+nI0BYBIBu0weeCEvPHtMRICwCQKeVp3aGNYee1xEgLAJAp/bj55n3HtARICwCQDePn0FYBICeVp7aEdYcek5HgLAIAJ0WHj/v9vgZhEUA6GH6wOMeP4OwCADdFh4/H/b4GYRFAOhhZvf9OgGERQDoduHx81EdAcIiAHSamtsbpg8+riNAWASAbn+x70c6AYRFAOh29+ENYcXpHToChEUA6NTeU3H6wM91BAiLANBtZs99YfL8nI4AYREAOq08vT3cefJtHQHCIgB0a68qAsIiAHSZPviYPRVBWASAbsvOHlkIi4CwCABdZvZ6/AzCIgD0cNfJN8OK09t1BAiLANBt7f6HdQIIiwDQbfrQz7ypBYRFAOjWflPL3Uee0REgLAJAt/aqopNaQFgEgC4rT28Lq46/rCNAWASAbn9x4CGdAMIiAHRbffylsPzMHh0BwiIAdFpyfjZMH/qpjgBhEQC6rTnyTFh67oiOAGERADotbJVz9GkdAcIiAHSbPvwPtsoBYREAurVXFVcdf0lHgLAIAN1m9n9fJ4CwCADdVs5uDStmt+kIEBYBoNufH/4HnQDCIgB0W338RauKICwCQG/Th3+iE0BYBIBuq0+8YANuEBYBoDeriiAsAkBPdx97yqoiCIsA0G3J+dkwffhRHQHCIgB0W3P0Kcf6gbAIAN3aq4p3H3tSR4CwCADdrCqCsAgAPVlVBGERAPqyqgjCIgD0ZFURhEUA6MuqIgiLANCTVUUQFgGgL6uKICwCQF+rT7ygE0BYBIDeQdEZ0CAsAkBP04d/ohNAWASAblYVQVgEgL6sKoKwCAA9rZzdalURhEUA6O3Pj1hVBGERAHporyqumP8DCIsA0MW+iiAsAkBPy84dDqtOvKgjQFgEgG7to/0AYREAuiw5P+sRNAiLANDb6hMvhsnzczoChEUA6Lbm6JM6AYRFAOjmaD8QFgFgkbDoHdAgLAJAD1NndtuEG4RFAOjt7mNqFUFYBIAe2tvl2IQbhEUA6EmtIgiLANCX7XJAWASAnu46tdF2OSAsAkBvjvYDYREAelp27nC489QbOgKERQDotuq4N7aAsAgAfXgEDcIiAPTkjS0gLAJAX1YVQVgEgJ68sQWERQDoyxtbQFgEgL48ggZhEQB6Wjm71RtboGHeT1rbJibPnj+uKwAomlVFaJ5jrXP3T3z87PkndAUARVpyfnZhyxygOXZPnJv7Fw/MvDJx3fvn/uzaVmjpEgCK0g6Kk+fndAQ0yFvXzH2//c+J5/76e9tvnj33kC4BoCirT3gXNDRJe1Xx9++7908XwmL7f175b//7D37tzAfbdQ0AsbX3Vlwxu1VHQEPMJq3WhomT//rSv19+N/Qb9/yvWwRGAGKztyI0Kyj+5Jrj/+6Pfvg/nugKi5cC42dPn3tQDSMAsXgXNDTD29ec2ffAxJFb//C+//63H/77rn0W24+kv3Bs7tZ2aLzhXEs1MgC5TZ3ZbW9FqLH2SuJr185tf+ja4//xN374Xz+76of/s+sp8/yHDF5E/MaaP/nOwA9KMv+H4iUFfWJSRBuT/G1MYvdDkv/nTIroyxQ/a1LAzzT/sa1Bn5Qk+YdUms9NhvzdX/qgZIjfW5Lx+w4a00nO30+S52dKMvV7K8nQ1/1+zmSI38MI+q1k581fSg4vKfJ7fOzs2dlbjuzffeGCTbp/Gb3+Ps3H5v28rr/v9XWSRQbeoK+Z9B5wab7OMJ+b5uOHbUeetmRpT96vseh/T0Ln89ik32TS5997tKm16OSxyOcvekPrGk8nW+d+sOq+vx5Ygvj/BRgAcxbXROOIb6gAAAAASUVORK5CYII=')
+  background-size: 100%;
+  /* style='background-image:url(https://img3.bigaka.com/prd/2006/201912/20191216/2006a5a44693-3c66-4f82-8379-f6b8b64468e5.png)' */
+  /* background-image: url('https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/711_08.png'); */
 }
 .own-bg{
   width: 100%;
@@ -72,6 +73,36 @@ page{
   height: 120rpx;  
 }
 
+/* 二维码 */
+.u-qr-code{
+  background-color: #ffffff;
+  border-radius: 7rpx;
+  display: flex;
+  /* height: 300rpx; */
+  height: auto;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 30rpx 0;
+}
+
+.u-qr-code > canvas {
+  width: 300rpx;
+  height: 300rpx;  
+}
+
+.card-no{
+  margin-top: 10rpx;
+  letter-spacing: 2rpx;
+  font-size: 30rpx;
+}
+
+.u-qr-code label{
+  letter-spacing: 2rpx;
+  font-size: 36rpx;
+}
+
 .picker, .picker-address {
   padding: 20rpx;
   background-color: #FFFFFF;

src/pages/my/my.wxml

@@ -36,7 +36,7 @@
 <view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
 <share-benefit-modal show="{{shareBenefitModalShow}}" benefit-data="{{benefitData}}"/>
 <!-- 联系我 -->
-<view class="cell-me" wx:if="{{!isQiye}}">
+<view class="cell-me" wx:if="{{!isQiye && contactUsIsOpen}}">
   <cell 
   bind:startmessage='startmessage' 
   isMask="0" 
@@ -46,7 +46,7 @@
   buttonText="0" 
   bubbleColor="cb3c3c"
   bind:completemessage="completemessage" 
-  plugid='766c50920993bf9c41c6c3d2761a2df5'  />
+  plugid='{{contactUsPluginId}}'  />
 </view>
 
 <!-- 联系我点击成功之后的回调 -->

src/pages/userCenter/userCenter.js

@@ -274,7 +274,7 @@ wxService.page({
         this.setData({
           currHomePageId: data.page.pageId
         })
-
+        
         // 段落
         const products = data.paragraphs
         const filterResult = products.map((res, index) => {
@@ -290,6 +290,7 @@ wxService.page({
         const renderData = render.next()
         this.data.renderPageOver = renderData.done
         this.renderPageFunc({ products: renderData.value })
+        // this.renderPageFunc({ products: products })
         //是否有tabbar 或 plus
         let tabbar = products.filter(item => item.type == 5);
         let plus = products.filter(item => item.type == 9);
@@ -309,10 +310,7 @@ wxService.page({
             paddingBottom: '40rpx'
           })
         }
-
-
       }
-
     }).finally(() => {
       wx.hideLoading();
     })
@@ -324,6 +322,7 @@ wxService.page({
 	 * @param now
 	 */
   renderPageFunc({ products }) {
+    this.data.pages = [];
     // 9 plus(9/5-权重高)
     let newProducts = [...products]
     let typeArr = []
@@ -334,10 +333,7 @@ wxService.page({
       })
     }
 
-    // let productData = handlerDataOnPage.handlerArray(products)
     let productData = handlerDataOnPage.handlerArray(newProducts)
-    logger.log('productData.keysNum', productData.keysNum(), productData)
-
     this.setData({
       ...productData
     }, () => {

src/pages/userCenter/userCenter.wxml

@@ -47,7 +47,7 @@
 <view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
 <!--联系我 客服ID-->
 <!-- style='left:{{x}}px;top:{{y}}px' -->
-<view class="cell-me" wx:if="{{!isQiye}}" >
+<view class="cell-me" wx:if="{{!isQiye && contactUsIsOpen}}" >
   <cell 
   bind:startmessage='startmessage' 
   isMask="0" 
@@ -57,7 +57,7 @@
   buttonText="0" 
   bubbleColor="cb3c3c"
   bind:completemessage="completemessage" 
-  plugid='766c50920993bf9c41c6c3d2761a2df5'  />
+  plugid='{{contactUsPluginId}}'  />
   <!-- 766c50920993bf9c41c6c3d2761a2df5 -->
   <!-- 泰华 a6ea55b56eb09ced8f9aeeaa14383b52 -->
 </view>

src/shoppingGuid/page/pages/couponWriteOff/couponWriteOff.js

@@ -19,7 +19,6 @@ wxService.page({
    */
   onLoad: function (options) {
     let param = options.id;
-    console.log(param)
     if(param){
       this.getCurrentStoreId();
       this.data.couponId = param;
@@ -51,8 +50,6 @@ wxService.page({
   //获取优惠券详情
   getCouponDetail(){
     wxService.post(`/coupon/coupon/get?cardNo=${this.data.couponId}`).then(res => {
-      console.log('请求卡券详情接口cardNo----',this.data.couponId)
-      console.log('获取卡券结果----',res)
       if(res){
         this.data.couponInfo = res.data.data ? res.data.data : {};
         this.data.couponInfo.takeCouponBgimg = this.data.couponInfo.couponDetail.style.takeCouponBgimg;
@@ -93,7 +90,6 @@ wxService.page({
         } else if (res.cancel) {}
       }
     })
-
   },
 
   //核销优惠券
@@ -101,26 +97,28 @@ wxService.page({
     wx.showLoading({
       title: '核销中..',
     });
-    wxService.post(`/coupon/coupon/checkAndInvalid`,{
-      cardNo : this.data.couponId,
-      useStoreId: this.data.useStoreId,
-      brandId: app.globalData.brandId
-    }).then(res => {
+    let param = {};
+    param.cardNo = this.data.couponId;
+    param.useStoreId = this.data.useStoreId;
+    param.brandId = app.globalData.brandId;
+
+    wxService.post(`/coupon/coupon/checkAndInvalid`, param).then(res => {
+      wx.hideLoading();
       if(res){
         if (res.data.result == 0) {
           wx.showToast({
             title: '核销成功',
+            icon : 'success',
+            duration : 2000,
+            mask : true,
+            success : function(){
+              wx.navigateBack({
+                delta: 1
+              });
+            }
           });
-
-          setTimeout(() => {
-            wx.navigateBack({
-              delta: 1
-            });
-          },500);
         }
       }      
-    }).finally(() => {
-      wx.hideLoading();
     });
   }
 });
\ No newline at end of file

src/shoppingGuid/page/pages/home/home.js

@@ -219,7 +219,7 @@ wxService.page({
     let content = {
       title: item.title,
       id: id,
-      url: item.couponBg
+      url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png'
     }
     let tentacleInfo = {
       content: JSON.stringify(content),
@@ -236,8 +236,8 @@ wxService.page({
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         var path = 'subPackage/page/pages/scanCoupon/scanCoupon' + '?i=' + inner_id + '&t=' + inner_tentacleId;
         this.data.shareModel.title = item.title;
-        this.data.shareModel.imageUrl = item.couponBg;
-        this.data.shareModel.path = item.path;
+        this.data.shareModel.imageUrl = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png';
+        this.data.shareModel.path = path;
         this.setData({
           shareModel: this.data.shareModel,
           showModal: true
@@ -258,7 +258,7 @@ wxService.page({
     let content = {
       title: item.title,
       id: item.id,
-      url: item.imageBg
+      url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png'
     }
 
     let tentacleInfo = {
@@ -279,7 +279,7 @@ wxService.page({
         wx.qy.shareToExternalContact({
           appid: app.globalData.appId,//小程序的appid
           title: item.couponName, //小程序消息的title
-          imgUrl: item.imageBg,//小程序消息的封面图
+          imgUrl: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png',//小程序消息的封面图
           page: path, //小程序消息打开后的路径
           success: function (r) {
             wx.showToast({
@@ -431,6 +431,8 @@ wxService.page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function (res) {
+    console.log(res)
+    console.log(this.data.shareModel)
     if (res.from == 'button') {
       return {
         title: this.data.shareModel.title,

src/shoppingGuid/page/pages/kpi/kpi.js

@@ -35,7 +35,7 @@ wxService.page({
   onShow: function () {
     
   },
-  getTaskPage(pageSize, pageNo,current) { // 1 销售任务 2 招募任务
+  getTaskPage(pageSize, pageNo,current,refresh) { // 1 销售任务 2 招募任务
     wx.showLoading({
       title: '加载中'
     })
@@ -69,11 +69,19 @@ wxService.page({
             }
           })
           this.setData({
-            list: pageNo == 1? [...data.content]: [...this.data.list,...data.content],
+            list: pageNo == 1 ? [...data.content]: [...this.data.list,...data.content],
             totalPages: data.totalPages
           })
         }
       }
+
+      if(refresh){
+        wx.showToast({
+          title: '刷新成功',
+        });
+
+        wx.stopPullDownRefresh();
+      }
     })
   },
   // 点击事件
@@ -130,7 +138,11 @@ wxService.page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    this.data.pageSize = 10;
+    this.data.pageNo = 1;
+    this.data.list = [];
+    const { pageSize, pageNo, current } = this.data
+    this.getTaskPage(pageSize, pageNo, current,true)
   },
 
   /**

src/shoppingGuid/page/pages/kpi/kpi.json

 {
   "navigationBarTitleText": "任务中心",
+  "enablePullDownRefresh": true,
   "usingComponents": {
-    
+    "empty": "../../../../component/empty/empty"
   }
 }
\ No newline at end of file

src/shoppingGuid/page/pages/kpi/kpi.wxml

@@ -16,62 +16,66 @@
   </view>
 
   <!-- list -->
-  <view class='list' wx:if="{{current == 1}}">
-    <view class='list-item' 
-    wx:for="{{list}}"
-    wx:for-index="idx"
-    wx:key="listItem" 
-    bindtap='onTapToSaleTaskInfo'
-    data-item="{{item}}"
-    wx:for-item="item">
-      <view class='status-bar'>
-        <view class='status'>
-          已完成:<text>{{item.achieve}}</text>
+ <view wx:if="{{current == 1}}">
+   <view class='list' wx:if="{{list.length > 0}}">
+      <view class='list-item' 
+      wx:for="{{list}}"
+      wx:for-index="idx"
+      wx:key="listItem" 
+      bindtap='onTapToSaleTaskInfo'
+      data-item="{{item}}"
+      wx:for-item="item">
+        <view class='status-bar'>
+          <view class='status'>
+            已完成:<text>{{item.achieve}}</text>
+          </view>
+          <view class='percent'>{{item.rate}}</view>
         </view>
-        <view class='percent'>{{item.rate}}</view>
-      </view>
-      <view class='task-time'>
-         <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
-         <text>{{item.task.startStr}}～{{item.task.endStr}}</text>
-      </view>
-      <view class='task-info'>
-        <view class='lf'>
-          <image src='/assets/imgs/shoppingGuide/kpi_task_name.png' mode='widthFix'></image>
-          <text>{{item.task.name}}</text>
+        <view class='task-time'>
+          <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
+          <text>{{item.task.startStr}}～{{item.task.endStr}}</text>
+        </view>
+        <view class='task-info'>
+          <view class='lf'>
+            <image src='/assets/imgs/shoppingGuide/kpi_task_name.png' mode='widthFix'></image>
+            <text>{{item.task.name}}</text>
+          </view>
+          <view class='rg'> 目标：{{item.task.target}} 元</view>
         </view>
-        <view class='rg'> 目标：{{item.task.target}} 元</view>
       </view>
     </view>
-  </view>
+    <empty text="暂无进行中销售任务哦~" wx:else/>
+ </view>
 
   <!-- 招募任务 -->
-  <view class='list' wx:if="{{current == 2}}">
-    <view class='list-item' 
-    wx:for="{{list}}"
-    wx:for-index="idx"
-    wx:key="listItem" 
-    bindtap='onTapToInviteTaskInfo'
-    data-item="{{item}}"
-    wx:for-item="item">
-      <view class='status-bar'>
-        <view class='status'>
-          已完成:<text>{{item.achieve}}</text>
+  <view wx:if="{{current == 2}}">
+    <view class='list' wx:if="{{list.length > 0}}">
+      <view class='list-item' 
+      wx:for="{{list}}"
+      wx:for-index="idx"
+      wx:key="listItem" 
+      bindtap='onTapToInviteTaskInfo'
+      data-item="{{item}}"
+      wx:for-item="item">
+        <view class='status-bar'>
+          <view class='status'>
+            已完成:<text>{{item.achieve}}</text>
+          </view>
+          <view class='percent'>{{item.rate}}</view>
         </view>
-        <view class='percent'>{{item.rate}}</view>
-      </view>
-      <view class='task-time'>
-        <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
-        <text>{{item.task.startStr}}～{{item.task.endStr}}</text>
-      </view>
-      <view class='task-info'>
-        <view class='lf'>
-          <image src='/assets/imgs/shoppingGuide/kpi_task_name.png' mode='widthFix'></image>
-          <text>{{item.task.name}}</text>
+        <view class='task-time'>
+          <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
+          <text>{{item.task.startStr}}～{{item.task.endStr}}</text>
+        </view>
+        <view class='task-info'>
+          <view class='lf'>
+            <image src='/assets/imgs/shoppingGuide/kpi_task_name.png' mode='widthFix'></image>
+            <text>{{item.task.name}}</text>
+          </view>
+          <view class='rg'> 目标：{{item.task.target}} </view>
         </view>
-        <view class='rg'> 目标：{{item.task.target}} </view>
       </view>
     </view>
+    <empty text="暂无进行中招募任务哦~" wx:else/>
   </view>
-
-
 </view>

src/shoppingGuid/page/pages/moreCoupons/moreCoupons.js

@@ -91,8 +91,8 @@ wxService.page({
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         var path = 'subPackage/page/pages/scanCoupon/scanCoupon' + '?i=' + inner_id + '&t=' + inner_tentacleId;
         this.data.shareCouponObj.title = item.title;
-        this.data.shareCouponObj.imageUrl = item.imageBg;
-        this.data.shareCouponObj.path = item.path;
+        this.data.shareCouponObj.imageUrl = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png';
+        this.data.shareCouponObj.path = path;
         this.setData({
           shareCouponObj: this.data.shareCouponObj,
           showShareModel : true
@@ -134,7 +134,7 @@ wxService.page({
         wx.qy.shareToExternalContact({
           appid: app.globalData.appId,//小程序的appid
           title: item.couponName, //小程序消息的title
-          imgUrl: item.imageBg,//小程序消息的封面图
+          imgUrl: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png',//小程序消息的封面图
           page: path, //小程序消息打开后的路径
           success: function (r) {
             wx.showToast({

src/shoppingGuid/page/pages/welfare/welfare.js

@@ -148,8 +148,8 @@ wxService.page({
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         var path = 'subPackage/page/pages/scanCoupon/scanCoupon' + '?i=' + inner_id + '&t=' + inner_tentacleId;
         this.data.shareModel.title = item.title;
-        this.data.shareModel.imageUrl = item.couponBg;
-        this.data.shareModel.path = item.path;
+        this.data.shareModel.imageUrl = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png';
+        this.data.shareModel.path = path;
         this.setData({
           shareModel: this.data.shareModel,
           showModal: true
@@ -192,7 +192,7 @@ wxService.page({
         wx.qy.shareToExternalContact({
           appid: app.globalData.appId,//小程序的appid
           title: item.couponName, //小程序消息的title
-          imgUrl: item.imageBg,//小程序消息的封面图
+          imgUrl: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png',//小程序消息的封面图
           page: path, //小程序消息打开后的路径
           success: function (r) {
             wx.showToast({

src/subPackage/page/pages/categoryPro/categoryPro.js

@@ -2,7 +2,6 @@
 var app = getApp()
 const wxService = require('../../../../utils/wxService')
 import { Integer } from '../../../../utils/integerDigitalConvertion'
-const { memberId, member } = wx.getStorageSync('_baseUserInfo')
 
 wxService.page({
 
@@ -64,17 +63,18 @@ wxService.page({
 
       this.generatePointObject(tentacleInfo);
     }
+
+    this.setData({
+      'form.sortType': this.data.currentTab
+    })
+    this.getProList();
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    const { memberId, member } = wx.getStorageSync('_baseUserInfo')
-    this.setData({
-      'form.sortType': this.data.currentTab
-    })
-    this.getProList();
+    
   },
 
   // 切换tab
@@ -101,11 +101,13 @@ wxService.page({
   },
 
   //获取商品列表
-  getProList() {
+  getProList(refresh) {
     wx.showLoading({
       title: '加载中'
-    })
-    wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, this.data.form).then(res => {
+    });
+    let pageNo = this.data.pageNo,
+      pageSize = this.data.pageSize;
+    wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
       const { result, data } = res.data
       if (result == 0 && data.content) {
         wx.hideLoading()
@@ -115,6 +117,14 @@ wxService.page({
           totalElements: data.totalElements
         })
       }
+
+      if (refresh){
+        wx.showToast({
+          title: '数据已刷新',
+        });
+        wx.stopPullDownRefresh();
+      }
+
     }).finally(() => {
       wx.hideLoading()
     })
@@ -128,28 +138,12 @@ wxService.page({
   },
 
   /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    this.setData({
-      pageNo: 1,
-    })
-    this.getProList()
-    wx.stopPullDownRefresh();
+    this.data.pageNo = 1;
+    this.data.totalPages = 0;
+    this.getProList(true);
   },
 
   /**

src/subPackage/page/pages/categoryPro/categoryPro.json

 {
   "navigationBarTitleText": "商品列表",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "product-list-style-one": "/component/productListStyleOne/productListStyleOne",
     "product-list-style-two": "/component/productListStyleTwo/productListStyleTwo",

src/utils/Http.js

@@ -82,8 +82,8 @@ class Http {
 
   get (url, parmas) {
     let baseUserInfo = wx.getStorageSync('_baseUserInfo')
-    console.log(this.getTentacle())
-    if(baseUserInfo){
+    let guideUserInfo = wx.getStorageSync('guidBaseInfo');
+    if (baseUserInfo || guideUserInfo){
       return this.request({
         url,
         method: 'GET',
@@ -196,7 +196,6 @@ class Http {
         })
       })
     }
-    console.log(JSON.stringify(error))
     return Promise.reject(error)
   }
 

src/utils/wxService.js

@@ -165,7 +165,7 @@ class WXService extends Http {
 
   login() {
     const currentEnv = wx.getStorageSync('_qyWeChat')
-    console.log('全局', currentEnv)
+    // console.log('全局', currentEnv)
     return new Promise((resolve, reject) => {
       wx.login({
         success: (res) => {
@@ -217,12 +217,12 @@ class WXService extends Http {
       icon: 'none'
     })
 
-    console.log(JSON.stringify(baseUserInfo))
+    // console.log(JSON.stringify(baseUserInfo))
     return this.get('i-user/info', {
       unionId: baseUserInfo.unionId,
       minaOpenId: baseUserInfo.openId
     }).then((res) => {
-      console.log('i-user/info res is %o ', res)
+      // console.log('i-user/info res is %o ', res)
       if (res.data.code === -10001) {
         this.showToast(`${res.data.message}`)
         return Promise.reject({
@@ -257,7 +257,7 @@ class WXService extends Http {
 
   //生成触点对象Id
   getTentacleContent(tentacleInfo) {
-    console.log('生成触点对象Id', tentacleInfo)
+    // console.log('生成触点对象Id', tentacleInfo)
     return this.post('/marketing/tentacleContent/getTentacleContent', tentacleInfo).then((res) => {
       let data = res.data.data
       return Promise.resolve(data);
@@ -349,7 +349,7 @@ class WXService extends Http {
     //判断tentacleInfo是否为空
     if (!tentacleInfo) {
       wx.setStorageSync('TENTACLE_CONTENT', tempTentacleInfo);
-      console.log('TENTACLE_CONTENT', wx.getStorageSync('TENTACLE_CONTENT'))
+      // console.log('TENTACLE_CONTENT', wx.getStorageSync('TENTACLE_CONTENT'))
       return;
     }
     //tentacleInfo 不为空
@@ -576,6 +576,8 @@ class WXService extends Http {
     // 集点体验者
     config.data.experAccessible;
     config.data.plusIsOpen = envInfo.plusIsOpen;
+    config.data.contactUsPluginId = envInfo.contactUsPluginId;
+    config.data.contactUsIsOpen = envInfo.contactUsIsOpen;
 
     const CONFIG_PAPGE = {
       onLoad: function (...args) {
@@ -604,8 +606,8 @@ class WXService extends Http {
             pageIsFromShare = true;
             let idParam = decodeURIComponent(item['scene']).split('&')[0];
             let shareId = idParam && idParam.split('=')[1] || 0;
-            console.log(shareId)
-            console.log(idParam)
+            // console.log(shareId)
+            // console.log(idParam)
             //处理pageId的
             if (idParam.indexOf('pageId') > -1){
               item['pageId'] = shareId;
@@ -623,8 +625,6 @@ class WXService extends Http {
           _self.getTentacleContentByTentacleId(id);
         }
 
-        // console.log('args ----',args)
-
         config.onLoad && config.onLoad.apply(page, args);
       },
       onShow: function (...args) {
@@ -644,8 +644,8 @@ class WXService extends Http {
         let currentEndTime = (new Date(premiumExpireStorage.replace(/-/g, '/'))).getTime(); // 到期时间
         let currentTime = (new Date()).getTime();
         let vipFlag = currentTime <= currentEndTime ? true : false // 当前时间 < 到期时间为vip
-        console.log('premiumExpireStorage', premiumExpireStorage)
-        console.log('当前时间 < 到期时间为vip', vipFlag)
+        // console.log('premiumExpireStorage', premiumExpireStorage)
+        // console.log('当前时间 < 到期时间为vip', vipFlag)
 
         if (baseUserInfo && wx.getStorageSync('token')) {
           page.setData({
@@ -727,12 +727,12 @@ class WXService extends Http {
       },
       //处理分享页面打开时参数为memberId时生成触点对象信息
       generatePointObject(tentacleInfo) {
-        console.log('---call 生成触点接口----')
-        console.log(tentacleInfo)
+        // console.log('---call 生成触点接口----')
+        // console.log(tentacleInfo)
 
         _self.getTentacleContent(tentacleInfo).then(res => {
-          console.log('-----处理分享页面打开时参数为memberId时生成触点对象信息------')
-          console.log('-----成功返回是------', res);
+          // console.log('-----处理分享页面打开时参数为memberId时生成触点对象信息------')
+          // console.log('-----成功返回是------', res);
           if (res && res.tentacleId) {
             let data = res;
             let TENTACLE_CONTENT = {
@@ -899,11 +899,11 @@ class WXService extends Http {
     const baseUserInfo = wx.getStorageSync('_baseUserInfo')
     return new Promise((resolve, reject) => {
       if (baseUserInfo && baseUserInfo.memberActivateStatus) {
-        console.log('已开卡', baseUserInfo)
+        // console.log('已开卡', baseUserInfo)
         wxService.openCardList()
         resolve(baseUserInfo)
       } else if (!baseUserInfo || !baseUserInfo.memberActivateStatus) {
-        console.log('去开卡', baseUserInfo)
+        // console.log('去开卡', baseUserInfo)
         return this.navigateToMiniProgram({
           biz: baseUserInfo.biz,
           encrypt_card_id: baseUserInfo.encryptCardId,
@@ -980,7 +980,6 @@ class WXService extends Http {
 
   getCitysEnterty() {
     const citys = citysData.default
-    console.log('8888', citys)
     let list = {}
     if (this.citysEntertys) {
       list = this.citysEntertys
@@ -988,7 +987,6 @@ class WXService extends Http {
       for (const key in citys) {
         if (citys.hasOwnProperty(key)) {
           const element = citys[key]
-          console.log('element', element)
           handler2citys({
             city: element,
             result: { name: [], code: [] },