From 01eedb0b826e11f1ebe589cb4fffb495e77d7c5e Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Fri, 13 Aug 2021 17:34:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  2 +-
 pages/car/index.wxml                        |  2 +-
 pages/cashier/cashier.wxml                  |  8 +++---
 pages/code/code.js                          | 10 +++----
 pages/code/code.wxml                        |  4 +--
 pages/rights/rights.js                      |  3 --
 pages/rights/rights.wxml                    |  2 +-
 pages/userGoods/goodsCode/goodsCode.wxml    |  4 +--
 pages/userStored/storedCode/storedCode.wxml |  4 +--
 pages/welfare/welfare.wxml                  |  2 +-
 project.config.json                         | 32 ++++++++++++---------
 11 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/app.js b/app.js
index 6f5f76c..238a294 100644
--- a/app.js
+++ b/app.js
@@ -11,7 +11,7 @@ var qqmapsdk;
 App({
     onLaunch(e) {
         // 获取打开场景值
-        this.globalData.scene = e.scene
+        // this.globalData.scene = e.scene
 
         // 沃支付是否开启
         api.index.woPayment().then(res=>{
diff --git a/pages/car/index.wxml b/pages/car/index.wxml
index 14195cc..85c6219 100644
--- a/pages/car/index.wxml
+++ b/pages/car/index.wxml
@@ -27,7 +27,7 @@
     </view>
 
     <view class="rightsNumber">
-        <image class="rightsGoods-img" src="{{detail.cover}}" mode="aspectFill"></image>
+        <image class="rightsGoods-img" src="{{detail.goods_cover}}" mode="aspectFill"></image>
         <view class="rightsGoods">
             <view class="nowrap rightsGoods-text">
                 {{detail.title}}
diff --git a/pages/cashier/cashier.wxml b/pages/cashier/cashier.wxml
index e2e365f..e706e66 100644
--- a/pages/cashier/cashier.wxml
+++ b/pages/cashier/cashier.wxml
@@ -5,13 +5,13 @@
 </view>
 
 <view style="padding-top: {{barHeight + 45}}px">
-    <view class="cashierTips">
+    <!-- <view class="cashierTips">
         <image src="/static/img/cashierTips_icon.png" mode="aspectFill"></image>注：推荐使用沃支付，可在享优惠！
-    </view>
+    </view> -->
     <view class="cashierCont">
-        <view class="cashierCont-title">
+        <!-- <view class="cashierCont-title">
             <text>支付类型</text>线上支付
-        </view>
+        </view> -->
         <view class="cashierCont-price">
             <view class="cashierCont-price-title">
                 付款金额
diff --git a/pages/code/code.js b/pages/code/code.js
index 57f24fb..68da0b0 100644
--- a/pages/code/code.js
+++ b/pages/code/code.js
@@ -19,11 +19,11 @@
      * 生命周期函数--监听页面加载
      */
     onLoad (options) {
-        if(getApp().globalData.scene === 1155 && options.type === "shareLogin"){
-            wx.switchTab({
-                url: '/pages/index/index',
-            })
-        }
+        // if(getApp().globalData.scene === 1155 && options.type === "shareLogin"){
+        //     wx.switchTab({
+        //         url: '/pages/index/index',
+        //     })
+        // }
 
         // 获取用户信息和二维码
         wx.$api.user.myshare('mini','','pages/index/index?type=shareLogin').then(res=>{
diff --git a/pages/code/code.wxml b/pages/code/code.wxml
index 7138755..0f1dc6c 100644
--- a/pages/code/code.wxml
+++ b/pages/code/code.wxml
@@ -25,10 +25,10 @@
         <image src="/static/img/code_icon_00.png"></image>
         微信好友
     </button>
-    <view class="codeShare-label" bindtap="shareShow">
+    <!-- <view class="codeShare-label" bindtap="shareShow">
         <image src="/static/img/code_icon_01.png"></image>
         朋友圈
-    </view>
+    </view> -->
     <view class="codeShare-label" bindtap="removeSaveImg" hover-class="none">
         <image src="/static/img/code_icon_02.png"></image>
         生成海报
diff --git a/pages/rights/rights.js b/pages/rights/rights.js
index 7d7a524..20678df 100644
--- a/pages/rights/rights.js
+++ b/pages/rights/rights.js
@@ -50,8 +50,6 @@ Page({
             openid    : options.openid || '',
             orderType : options.orderType
         })
-
-        console.log(getApp().globalData.shareObj)
     },
 
     /**
@@ -275,7 +273,6 @@ Page({
         }
         
         if(shareObj.type == 'shareGoods' && shareObj.goodsId == right_id){
-            console.log(22222)
             newParent = shareObj.userId
         }
 
diff --git a/pages/rights/rights.wxml b/pages/rights/rights.wxml
index 0dce9cf..47ef603 100644
--- a/pages/rights/rights.wxml
+++ b/pages/rights/rights.wxml
@@ -55,7 +55,7 @@
 	</view>
 
 	<view class="rightsNumber">
-		<image class="rightsGoods-img" src="{{detail.cover}}" mode="aspectFill"></image>
+		<image class="rightsGoods-img" src="{{detail.goods_cover}}" mode="aspectFill"></image>
 		<view class="rightsGoods">
 			<view class="nowrap rightsGoods-text">
 				{{detail.title}}
diff --git a/pages/userGoods/goodsCode/goodsCode.wxml b/pages/userGoods/goodsCode/goodsCode.wxml
index 9b88c60..b5b6537 100644
--- a/pages/userGoods/goodsCode/goodsCode.wxml
+++ b/pages/userGoods/goodsCode/goodsCode.wxml
@@ -23,10 +23,10 @@
             <image src="/static/img/code_icon_00.png"></image>
             微信好友
         </button>
-        <view class="codeShare-label" bindtap="shareShow">
+        <!-- <view class="codeShare-label" bindtap="shareShow">
             <image src="/static/img/code_icon_01.png"></image>
             朋友圈
-        </view>
+        </view> -->
         <view class="codeShare-label" bindtap="removeSaveImg" hover-class="none">
             <image src="/static/img/code_icon_02.png"></image>
             生成海报
diff --git a/pages/userStored/storedCode/storedCode.wxml b/pages/userStored/storedCode/storedCode.wxml
index 67234a8..f9c8a12 100644
--- a/pages/userStored/storedCode/storedCode.wxml
+++ b/pages/userStored/storedCode/storedCode.wxml
@@ -11,10 +11,10 @@
         <image src="/static/img/code_icon_00.png"></image>
         微信好友
     </button>
-    <view class="codeShare-label" bindtap="shareShow">
+    <!-- <view class="codeShare-label" bindtap="shareShow">
         <image src="/static/img/code_icon_01.png"></image>
         朋友圈
-    </view>
+    </view> -->
     <view class="codeShare-label" bindtap="removeSaveImg" hover-class="none">
         <image src="/static/img/code_icon_02.png"></image>
         生成海报
diff --git a/pages/welfare/welfare.wxml b/pages/welfare/welfare.wxml
index e09f132..2fdffd8 100644
--- a/pages/welfare/welfare.wxml
+++ b/pages/welfare/welfare.wxml
@@ -45,7 +45,7 @@
 	</view>
 
     <view class="rightsNumber">
-		<image class="rightsGoods-img" src="{{rightData.cover}}" mode="aspectFill"></image>
+		<image class="rightsGoods-img" src="{{rightData.goods_cover}}" mode="aspectFill"></image>
 		<view class="rightsGoods">
 			<view class="nowrap rightsGoods-text">
 				{{rightData.title}}
diff --git a/project.config.json b/project.config.json
index 4c174b2..65ee5ea 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,30 +4,36 @@
         "ignore": []
     },
     "setting": {
-        "bundle": false,
-        "userConfirmedBundleSwitch": false,
         "urlCheck": true,
-        "scopeDataCheck": false,
-        "coverView": true,
         "es6": true,
+        "enhance": true,
         "postcss": true,
-        "compileHotReLoad": false,
-        "lazyloadPlaceholderEnable": false,
         "preloadBackgroundData": false,
         "minified": true,
-        "autoAudits": false,
         "newFeature": false,
-        "uglifyFileName": false,
-        "uploadWithSourceMap": true,
-        "useIsolateContext": true,
+        "coverView": true,
         "nodeModules": false,
-        "enhance": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
         "useMultiFrameRuntime": true,
         "useApiHook": true,
         "useApiHostProcess": false,
-        "showShadowRootInWxmlPanel": true,
-        "packNpmManually": false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
         "enableEngineNative": false,
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
         "packNpmRelationList": [],
         "minifyWXSS": true,
         "showES6CompileOption": false