fix

htoooth
Commit 0bb488b5bc50b6a27b2625b0d51fbfbf81a3cbb2 1 parent abd2b41f
Showing 7 changed files with 31 additions and 20 deletions
app/pages/product/detail/detail.js
app/pages/product/detail/detail.wxml
app/pages/product/detail/detail.wxss
app/pages/snapshootShare/snapshootShare.js
app/pages/snapshootShare/snapshootShare.wxss
app/project.config.json
app/router/jump-to-miniapp.js
--- a/app/pages/product/detail/detail.js
View file @0bb488b
+++ b/app/pages/product/detail/detail.js
View file @0bb488b
@@ -214,7 +214,7 @@ Page(Object.assign({
             llimitProductCode: this.data.limitProductCode
           };
-          let product_qrCode = config.domains.api + `/wechat/miniapp/img-check.jpg?param=${stringify(params)}&miniapp_type=4&miniQrType=11`; // eslint-disable-line
+          let product_qrCode = config.domains.api + `/wechat/miniapp/img-check.jpg?param=${JSON.stringify(params)}&miniapp_type=4&miniQrType=11`; // eslint-disable-line
           let snapData = {
             product_name: res.data.productName,
@@ -260,10 +260,10 @@ Page(Object.assign({
         let assisStatus = ASSIS_STATUS.SHARE;
-        if (this.assisLimit === result.data.list.length) {
+        if (this.data.assisLimit === result.data.list.length) {
           assisStatus = ASSIS_STATUS.ASSIS_FULL;
         } else {
-          if (this.originUid) {
+          if (this.data.originUid) {
             assisStatus = ASSIS_STATUS.ASSIS_ACTION;
           } else {
             assisStatus = ASSIS_STATUS.UN_ASSIS;
@@ -340,7 +340,7 @@ Page(Object.assign({
       } else if (result.code === 401) {
         this.setData({
-          assisSuccess: ASSIS_SUCCESS.ok
+          assisSuccess: ASSIS_SUCCESS.repeat
         });
       } else {
         this.showError();
--- a/app/pages/product/detail/detail.wxml
View file @0bb488b
+++ b/app/pages/product/detail/detail.wxml
View file @0bb488b
@@ -15,7 +15,7 @@
         </view>
         <view class="advanceTitle">{{reminderNum}}人已关注</view>
     </view>
-    <view class="detail-btn">查看商品详情</view>
+    <view class="detail-btn" bindtap="buyNow">查看商品详情</view>
 </view>
 <view class="line"></view>
 <view class="detail-container">
--- a/app/pages/product/detail/detail.wxss
View file @0bb488b
+++ b/app/pages/product/detail/detail.wxss
View file @0bb488b
@@ -94,7 +94,7 @@
 }
 .action-list {
-    width: 600rpx;
+    width: 610rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;
--- a/app/pages/snapshootShare/snapshootShare.js
View file @0bb488b
+++ b/app/pages/snapshootShare/snapshootShare.js
View file @0bb488b
@@ -129,14 +129,14 @@ Page({
       defaultImage = defaultImage.replace('http://', 'https://');
     }
-    that.drawLongText('你的好友邀你为ta助力，购买限定商品', pCtx, 187.5 * scale, 50 * scale, 'black', 18, 20);
+    that.drawLongText('你的好友邀你为ta助力，购买限定商品', pCtx, 187.5 * scale, 50 * scale, 'black', 17, 20);
     wx.getImageInfo({
       src: defaultImage,
       success: function(res) {
-        pCtx.drawImage(res.path, 27 * scale, 60 * scale, 320 * scale, 279 * scale);
+        pCtx.drawImage(res.path, 27 * scale, 70 * scale, 320 * scale, 279 * scale);
         pCtx.setFillStyle('white');
-        that.drawLongText(that.data.product_name, pCtx, 187.5 * scale, 352 * scale, 'black', 14, 20);
+        that.drawLongText(that.data.product_name, pCtx, 187.5 * scale, 382 * scale, 'black', 14, 20);
         pCtx.setTextAlign('center');
         pCtx.setFontSize(18 * scale);
         pCtx.draw(true);
--- a/app/pages/snapshootShare/snapshootShare.wxss
View file @0bb488b
+++ b/app/pages/snapshootShare/snapshootShare.wxss
View file @0bb488b
@@ -4,17 +4,17 @@
   left: 0rpx;
   top: 0rpx;
   width: 750rpx;
-  height: 1206rpx;
+  height: 100%;
    background-color: rgba(0, 0, 0, 0.5); 
   flex-direction: column;
   z-index: 9999;
 }
 .snapshoot-container .snapshoot-content {
-  margin-top: 58rpx;
+  margin-top: 100rpx;
   margin-left: 105rpx;
   width: 540rpx;
-  height: 960rpx;
+  height: 1000rpx;
   background-color: white;
   flex-direction: column;
 }
@@ -92,8 +92,8 @@
 }
 .product-qrcode {
-  width: 130rpx;
-  height: 130rpx;
+  width: 180rpx;
+  height: 180rpx;
   margin-top: 21rpx;
 }
@@ -162,8 +162,8 @@
     width: 460rpx;
     height: 400rpx;
     background-color: white;
-    box-shadow:5px 5px 3px rgba(0, 0, 0, 0.05); 
-    border: 0.5rpx solid #e5e5e5;
+    /* box-shadow:5px 5px 3px rgba(0, 0, 0, 0.05);  */
+    /* border: 0.5rpx solid #e5e5e5; */
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -177,7 +177,7 @@
 .product-info-content {
   width: 100%;
-  height: 180rpx;
+  height: 110rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -234,7 +234,7 @@
 .snapshoot-bottom {
   margin-left: 105rpx;
-  margin-top: 50rpx;
+  margin-top: 20%;
   width: 540rpx;
   height: 88rpx;
   display: flex;
--- a/app/project.config.json
View file @0bb488b
+++ b/app/project.config.json
View file @0bb488b
@@ -33,7 +33,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 6,
 			"list": [
 				{
 					"id": 0,
@@ -70,6 +70,17 @@
 					"name": "情详页-好友助力",
 					"pathName": "pages/product/detail/detail",
 					"query": "limitProductCode=2018062115403668"
+				},
+				{
+					"id": 6,
+					"name": "分享卡片进入小程序",
+					"pathName": "pages/product/detail/detail",
+					"query": "limitProductCode=2018062815591248&originUid=500031864",
+					"scene": "1037",
+					"referrerInfo": {
+						"appId": "wx084ab813d88c594b",
+						"extraData": "{}"
+					}
 				}
 			]
 		}
--- a/app/router/jump-to-miniapp.js
View file @0bb488b
+++ b/app/router/jump-to-miniapp.js
View file @0bb488b
@@ -13,7 +13,7 @@ const appData = {
   yohobuy: {
     appId: 'wx084ab813d88c594b',
     page: {
-      productDetail: '/pages/goodsDetail/goodsDetail',
+      productDetail: 'pages/goodsDetail/goodsDetail',
       brandDetail: '/pages/goodsList/brand',
       guangDetail: 'pages/guang/detail'
     }