Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

src/component/sharePoster/sharePoster.js

@@ -35,8 +35,7 @@ Component({
   },
 
   attached() {
-    // 获取小程序二维码 url
-    this.getMiniCode()
+    
   },
 
   /**
@@ -109,8 +108,8 @@ Component({
         const { result, data } = res.data
         if(result == 0){
           this.setData({
-            // codeImg: data.codeUrl
-            codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
+            codeImg: data.codeUrl
+            // codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
           })
         }
         // if (result == 0) {
@@ -184,6 +183,8 @@ Component({
 
     //canvas绘制分享海报
     sharePosteCanvas: function (avaterSrc, codeSrc, imgInfo) {
+      // 获取小程序二维码 url
+      this.getMiniCode()
       wx.showLoading({
         title: '生成中...',
         mask: true,

src/pages/logistics/logistics.js

@@ -36,6 +36,11 @@ Page({
     console.log('-----code----', code)
   },
 
+  // 获取物流信息
+  getLogisticsInfo(){
+    
+  },
+
   copy(e) {
     wx.setClipboardData({
       //准备复制的数据

src/pages/wantToBuyDetail/wantToBuyDetail.json

-{
-  "navigationBarTitleText": "详情",
-  "usingComponents": {
-    "buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper",
-    "card-modal": "/component/cardModal/cardModal"
-  }
-}
\ No newline at end of file