优化签到

src/pages/productDetail/productDetail.js

@@ -447,6 +447,7 @@ wxService.page({
           this.data.productInfo.hasPromotionTag = markTagInfo ? true : false;
           let tagPrice = this.data.productInfo.minSalePrice;
           if(this.data.productInfo.hasPromotionTag){
+            this.data.productInfo.markTagInfo = data.markTagInfo;
             this.data.productInfo.tagPic = this.data.productInfo.markTagInfo.tagPicUrl;
             if(this.data.productInfo.markTagInfo.tagType == 2){
               tagPrice = this.data.productInfo.minSalePrice;

src/project.config.json

@@ -7,6 +7,7 @@
 		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
@@ -21,7 +22,8 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",

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

@@ -145,6 +145,10 @@ wxService.page({
       pageSize = this.data.pageSize;
       // wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
     this.data.form.state = 1;
+    if(this.data.form.sortType == 'recommend'){
+      this.data.form.order = 'desc';
+    }
+
     wxService.post(`/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
       const { result, data } = res.data
       if (result == 0 && data.content) {

src/subPackageMarketing/page/pages/liveSubscrib/liveSubscrib.js

@@ -3,7 +3,7 @@ const wxService = require('../../../../utils/wxService')
 const utils = require('../../../../utils/util')
 import { Integer } from '../../../../utils/integerDigitalConvertion'
 const app = getApp();
-let livePlayer = requirePlugin('live-player-plugin')
+// let livePlayer = requirePlugin('live-player-plugin')
 
 wxService.page({
 
@@ -24,18 +24,6 @@ wxService.page({
     this.setData({
       room_id : this.data.room_id
     });
-
-    livePlayer.getLiveStatus({room_id : this.data.room_id}).then(res => {
-      console.log(res)
-    })
-
-
-    setTimeout(() => {
-      wx.createSelectorQuery().select('.live-player-subscribe__btn').boundingClientRect().exec((res) =>{
-        console.log(res)
-      });
-      
-    },1000);
   },
 
   //点击事件

src/subPackageMarketing/page/pages/sign/sign.js

@@ -8,6 +8,7 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
+      webviewSignUrl : '',
   },
 
   /**
@@ -15,6 +16,19 @@ wxService.page({
    */
   onLoad: function (options) {
     wx.hideShareMenu();
+    let token = wx.getStorageSync('token');
+    if(token){
+      this.data.webviewSignUrl = `${this.data.signUrl}&wx_minProgram_token=${token}`
+      this.setData({
+        webviewSignUrl : this.data.webviewSignUrl
+      });
+    }
+    else{
+      wx.showToast({
+        title: '请选登录！',
+        icon : 'none'
+      });
+    }
   },
 
   /**

src/subPackageMarketing/page/pages/sign/sign.wxml

 <!--subPackageMarketing/page/pages/sign/sign.wxml-->
 <view class="main-page">
-  <web-view src="{{signUrl}}"></web-view>
+  <web-view src="{{webviewSignUrl}}"></web-view>
 </view>
\ No newline at end of file