fix

@@ -33,5 +33,5 @@
   border-radius: 70rpx;
   border-radius: 70rpx;
   background-color: white;
   background-color: white;
   left: 50%;
   left: 50%;
-  transform: translate(-50%, -50%);
+  transform: translate(-50%, -45%);
 }
 }

@@ -151,6 +151,27 @@ Page(Object.assign({
 
 
     yas = new Yas(app); // 实例化埋点
     yas = new Yas(app); // 实例化埋点
     yas.pageOpenReport();
     yas.pageOpenReport();
+
+    wx.showLoading({
+      title: '加载中...',
+      mask: true,
+    });
+
+    setTimeout(() => {
+      app = app || getApp();
+
+      if (this.data.scene) {
+        this.loadDataFromCode().then(() => {
+          this.init().then(() => {
+            this._showRepeat();
+          });
+        });
+      } else {
+        this.init().then(() => {
+            this._showRepeat();
+        });
+      }
+    }, app ? 0 : 1000);
   },
   },
 
 
   loadDataFromCode() {
   loadDataFromCode() {
@@ -169,17 +190,6 @@ Page(Object.assign({
     });
     });
   },
   },
   onShow() {
   onShow() {
-    setTimeout(() => {
-      app = app || getApp();
-
-      if (this.data.scene) {
-        this.loadDataFromCode().then(() => {
-          this.init();
-        });
-      } else {
-        this.init();
-      }
-    }, app ? 0 : 1000);
   },
   },
   onShareAppMessage: function(res) {
   onShareAppMessage: function(res) {
     let params = {
     let params = {
@@ -371,19 +381,11 @@ Page(Object.assign({
           showAssistList = true;
           showAssistList = true;
         }
         }
 
 
-        if (assistStatus === ASSIST_STATUS.ASSIST_ALREADY_ACTION) {
-          this.setData({
-            assistStatus,
-            assistSuccess: ASSIST_SUCCESS.REPEAT,
-            modal: true
-          });
-        } else {
         this.setData({
         this.setData({
           avatarList: result.data.list || [],
           avatarList: result.data.list || [],
           assistStatus,
           assistStatus,
           showAssistList
           showAssistList
         });
         });
-        }
       });
       });
     } else if (this.data.limitProductType === LIMIT_TYPE.QUEUE) {
     } else if (this.data.limitProductType === LIMIT_TYPE.QUEUE) {
       return detailModel.getAssistInfo(uid, this.data.limitProductCode).then(result => {
       return detailModel.getAssistInfo(uid, this.data.limitProductCode).then(result => {
@@ -424,17 +426,9 @@ Page(Object.assign({
           queueStatus = QUEUE_STATUS.QUEUE_HELP;
           queueStatus = QUEUE_STATUS.QUEUE_HELP;
         }
         }
 
 
-        if (queueStatus === QUEUE_STATUS.QUEUE_HELP) {
-          this.setData({
-            queueStatus,
-            queueSuccess: QUEUE_SUCCESS.REPEAT,
-            modal: true
-          });
-        } else {
         this.setData({
         this.setData({
           queueStatus
           queueStatus
         });
         });
-        }
 
 
       });
       });
     }
     }
@@ -640,6 +634,11 @@ Page(Object.assign({
       refreshText: '加载中...'
       refreshText: '加载中...'
     });
     });
 
 
+    wx.showLoading({
+      title: '加载中...',
+      mask: true,
+    });
+
     this.init().then(() => {
     this.init().then(() => {
       wx.stopPullDownRefresh();
       wx.stopPullDownRefresh();
       this.setData({
       this.setData({
@@ -658,11 +657,6 @@ Page(Object.assign({
     });
     });
   },
   },
   init() {
   init() {
-    wx.showLoading({
-      title: '加载中...',
-      mask: true,
-    });
-
     return this.getUid().then(() => {
     return this.getUid().then(() => {
       return this.productInfo();
       return this.productInfo();
     }).then(() => {
     }).then(() => {
@@ -703,5 +697,20 @@ Page(Object.assign({
         });
         });
       }
       }
     });
     });
+  },
+  _showRepeat() {
+    if (this.data.queueStatus === QUEUE_STATUS.QUEUE_HELP) {
+      this.setData({
+        queueSuccess: QUEUE_SUCCESS.REPEAT,
+        modal: true
+      });
+    }
+
+    if (this.data.assistStatus === ASSIST_STATUS.ASSIST_ALREADY_ACTION) {
+      this.setData({
+        assistSuccess: ASSIST_SUCCESS.REPEAT,
+        modal: true
+      });
+    }
   }
   }
 }, Actionsheet));
 }, Actionsheet));

@@ -174,14 +174,15 @@
 }
 }
 
 
 .modal-content .modal-title {
 .modal-content .modal-title {
-    margin-top: 120rpx;
+    margin-top: 100rpx;
 }
 }
 
 
 .modal-content .sub-title {
 .modal-content .sub-title {
-    font-size: 36rpx;
+    font-size: 32rpx;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
     height: 50rpx;
     height: 50rpx;
     line-height: 50rpx;
     line-height: 50rpx;
+    font-weight: 600;
 }
 }
 
 
 .modal-content .sub-title2 {
 .modal-content .sub-title2 {
@@ -204,8 +205,8 @@
     height: 74rpx;
     height: 74rpx;
     line-height: 74rpx;
     line-height: 74rpx;
     background-color: #d0021b;
     background-color: #d0021b;
-    padding-left: 40rpx;
-    padding-right: 40rpx;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
     border-radius: 40rpx;
     border-radius: 40rpx;
     color: white;
     color: white;
 }
 }

@@ -5,6 +5,7 @@ const screenHeight = app.globalData.systemInfo.screenHeight;
 
 
 const scale = windowWidth / 375;
 const scale = windowWidth / 375;
 
 
+
 var Point = function(x, y) {
 var Point = function(x, y) {
   return {
   return {
     x: x,
     x: x,
@@ -142,12 +143,12 @@ Page({
       }
       }
     });
     });
 
 
-    pCtx.drawImage('./images/share-logo@2x.png', 132 * scale, 455 * scale, 111 * scale, 20 * scale);
+    pCtx.drawImage('./images/share-logo@2x.png', 132 * scale, 435 * scale, 111 * scale, 20 * scale);
 
 
     wx.getImageInfo({
     wx.getImageInfo({
       src: this.data.product_qrCode,
       src: this.data.product_qrCode,
       success: function(res) {
       success: function(res) {
-        pCtx.drawImage(res.path, 129.5 * scale, 490.5 * scale, 116 * scale, 116 * scale);
+        pCtx.drawImage(res.path, 129.5 * scale, 480.5 * scale, 120 * scale, 120 * scale);
         pCtx.draw(true);
         pCtx.draw(true);
       }
       }
     });
     });

@@ -36,7 +36,7 @@
     <view class="snapshoot-canvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px; background-color: white; margin-top: {{screenHeight}}px" >
     <view class="snapshoot-canvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px; background-color: white; margin-top: {{screenHeight}}px" >
         <canvas canvas-id="productDetailCanvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px;background-color: white"></canvas> 
         <canvas canvas-id="productDetailCanvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px;background-color: white"></canvas> 
     </view>
     </view>
-    <!-- <view class="snapshoot-canvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px; background-color: white; margin-top: {{-100}}px " >
+<!--     <view class="snapshoot-canvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px; background-color: white; margin-top: {{-100}}px " >
         <canvas canvas-id="productDetailCanvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px;background-color: white"></canvas> 
         <canvas canvas-id="productDetailCanvas" style="width: {{windowWidth}}px;height:{{screenHeight}}px;background-color: white"></canvas> 
     </view> -->
     </view> -->
 </view>
 </view>

@@ -89,11 +89,12 @@
   width: 160rpx;
   width: 160rpx;
   height: 29rpx;
   height: 29rpx;
   margin-top: 21rpx;
   margin-top: 21rpx;
+  margin-bottom: 30rpx;
 }
 }
 
 
 .snapshoot .shop-miniqr .shop-qrcode {
 .snapshoot .shop-miniqr .shop-qrcode {
-  width: 130rpx;
-  height: 130rpx;
+  width: 150rpx;
+  height: 150rpx;
   margin-top: 90rpx;
   margin-top: 90rpx;
 }
 }
 
 
@@ -101,12 +102,13 @@
   width: 180rpx;
   width: 180rpx;
   height: 180rpx;
   height: 180rpx;
   margin-top: 21rpx;
   margin-top: 21rpx;
+  margin-bottom: 20rpx;
 }
 }
 
 
 .snapshoot-container .snapshoot-save {
 .snapshoot-container .snapshoot-save {
   width: 260rpx;
   width: 260rpx;
   height: 88rpx;
   height: 88rpx;
-  background-color: red;
+  background-color: #d0021b;
   border-radius: 10rpx;
   border-radius: 10rpx;
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;