From 0b172029eb8d8b2dd759078da40e49be3aab0eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Sun, 15 Oct 2023 10:30:16 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=95=86=E5=93=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                     | 10 +++++-----
 pages/index/index.wxml       |  6 +++---
 pages/index/index.wxss       |  6 +++---
 pages/mall/buy/index.wxml    | 10 +++++-----
 pages/mall/goods/index.wxml  |  2 +-
 pages/mall/submit/index.wxml |  8 ++++----
 pages/order/list/index.wxml  |  4 ++--
 pages/user/index.wxml        | 10 +++++-----
 project.config.json          |  8 ++++++--
 project.private.config.json  |  2 +-
 双节底部图标.txt             | 16 +++++++---------
 11 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/app.json b/app.json
index 591e8cc..63f4b60 100644
--- a/app.json
+++ b/app.json
@@ -39,18 +39,18 @@
             {
                 "pagePath": "pages/index/index",
                 "text": "锶源商城",
-                "iconPath": "/static/festival/00.png",
-                "selectedIconPath": "/static/festival/00_active.png"
+                "iconPath": "/static/tabBarIcon/04.png",
+                "selectedIconPath": "/static/tabBarIcon/04_active.png"
             },
             {
                 "pagePath": "pages/user/index",
                 "text": "锶人中心",
-                "iconPath": "/static/festival/02.png",
-                "selectedIconPath": "/static/festival/02_active.png"
+                "iconPath": "/static/tabBarIcon/02.png",
+                "selectedIconPath": "/static/tabBarIcon/02_active.png"
             }
         ],
         "color": "#b6b9bb",
-        "selectedColor": "#000000",
+        "selectedColor": "#6c78f8",
         "borderStyle": "white"
     },
     "style": "v2",
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 77ca273..1dab1b8 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,9 +1,9 @@
 <!-- 双节弹出 -->
-<view class="haveBack" wx:if="{{haveimg}}" catchtouchmove></view>
+<!-- <view class="haveBack" wx:if="{{haveimg}}" catchtouchmove></view>
 <view class="haveCont"  wx:if="{{haveimg}}" catchtouchmove>
     <image class="haveCont-img" src="https://api.siyuankunlun.com/storage/images/2023/09/26/0a0d13f2ef6abe6275cc06eed53771d8.png" mode="widthFix"></image>
     <image class="haveCont-close" src="/static/icons/closeBig.png" mode="widthFix" bindtap="haveHIde"></image>
-</view>
+</view> -->
 
 <view class="page-section">
     <image class="videoCover" wx:if="{{videoState}}" src="http://cdn.siyuankunlun.com/materials/2022/10/13/cover.png"></image>
@@ -45,7 +45,7 @@
                         </view>
                         <view class="otherText">古海冰泉造就不凡</view>
                         <view class="othertitle">{{item.name}}</view>
-                        <!-- <view class="name">{{item.price.show}}元/箱</view> -->
+                        <view class="name">{{item.price.show}}元/箱</view>
                     </swiper-item>
                 </navigator>
             </swiper>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 5103cdf..3b52769 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -221,8 +221,8 @@ page {
 
 .other-swiper swiper {
     background: #fff;
-    height: 400rpx;
-    /* height: 450rpx; */
+    /* height: 400rpx; */
+    height: 500rpx;
 }
 
 .other-swiper .slide-image image {
@@ -246,7 +246,7 @@ page {
 .other-swiper .box {
     display: inline-block;
     width: 100%;
-    padding-top: 50%;
+    padding-top: 60%;
     position: relative;
 }
 
diff --git a/pages/mall/buy/index.wxml b/pages/mall/buy/index.wxml
index ac7c22c..f96a0ba 100644
--- a/pages/mall/buy/index.wxml
+++ b/pages/mall/buy/index.wxml
@@ -39,11 +39,11 @@
     <view class="goodsInfo-name">
         {{mallData.name}}
     </view>
-    <!-- <view class="goodsInfo-info">
+    <view class="goodsInfo-info">
         <view class="goodsInfo-price">
             <view class="goodsInfo-price-symbol">￥</view>{{mallData.price.show}}
         </view>
-    </view> -->
+    </view>
 </view>
 
 <!-- 产品详情 -->
@@ -63,8 +63,8 @@
     <view class="goods-info-footer {{barHeight > 30 ? 'iphoneX':''}}">已经到底拉，在往上逛一逛吧</view>
 </view>
 
-<!-- <view class="footer">
-    <view class="number">需<text>{{mallData.price.show}}</text>水滴</view>  之前就是隐藏的
+<view class="footer">
+    <!-- <view class="number">需<text>{{mallData.price.show}}</text>水滴</view>  之前就是隐藏的 -->
     <view class="number">￥<text>{{mallData.price.show}}</text></view>
     <view bindtap="buyTap" class="btn">立即购买</view>
-</view> -->
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/pages/mall/goods/index.wxml b/pages/mall/goods/index.wxml
index 2707fa3..be0eb98 100644
--- a/pages/mall/goods/index.wxml
+++ b/pages/mall/goods/index.wxml
@@ -12,7 +12,7 @@
             <view class="nowrap itemCont-text">{{item.description}}</view>
             <view class="itemCont-price">
                 <!-- <image src="/static/icons/newIcon_03.png"></image> -->
-                <!-- ￥{{item.price.price_max}} -->
+                ￥{{item.price.price_max}}
             </view>
         </view>
     </navigator>
diff --git a/pages/mall/submit/index.wxml b/pages/mall/submit/index.wxml
index a450a95..386f9f8 100644
--- a/pages/mall/submit/index.wxml
+++ b/pages/mall/submit/index.wxml
@@ -47,14 +47,14 @@
             <view class="label-name">重量</view>
             <view class="label-text">{{weight}}</view>
         </view>
-        <view class="label-item">
+        <!-- <view class="label-item">
             <view class="label-name">水滴兑换</view>
             <view class="label-integral">需{{amount}}水滴</view>
-        </view>
+        </view> -->
     </view>
 
     <!-- 购买方式 -->
-    <view class="label payWay" wx:if="{{surplus > 0}}">
+    <!-- <view class="label payWay" wx:if="{{surplus > 0}}">
         <view class="label-name">购买方式</view>
         <view class="cashierCont-pay-way">
             <radio-group bindchange="radioChange" style="width: 100%; display: block; height: 270rpx;">
@@ -74,7 +74,7 @@
                 </view>
             </radio-group>
         </view>
-    </view>
+    </view> -->
 </view>
 
 <!-- 底部 -->
diff --git a/pages/order/list/index.wxml b/pages/order/list/index.wxml
index eb21759..e93fa60 100644
--- a/pages/order/list/index.wxml
+++ b/pages/order/list/index.wxml
@@ -71,14 +71,14 @@
             <image class="payContList-label-arrow" src="{{ payType == 'wechat' ? '/static/icons/check_icon.png' : '/static/icons/userLogin_icon.png'}}"></image>
             <radio class="radio" value="wechat"></radio>
         </view>
-        <view class="payCont-label {{ payType == 'water' ? 'active' : ''}}" wx:if="{{surplus > 0}}">
+        <!-- <view class="payCont-label {{ payType == 'water' ? 'active' : ''}}" wx:if="{{surplus > 0}}">
             <view class="payContList-label-name">
                 <image class="payCont-label-img" src="/static/imgs/wqb.jpg"></image>
                 <text>水滴兑换</text>
             </view>
             <image class="payContList-label-arrow" src="{{ payType == 'water' ? '/static/icons/check_icon.png' : '/static/icons/userLogin_icon.png'}}"></image>
             <radio class="radio" value="water"></radio>
-        </view>
+        </view> -->
     </radio-group>
     <view class="payCont-btn" bindtap="paySubmit">{{ payType == 'wechat' ? '立即支付' : '立即兑换'}}</view>
 </view>
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 6d86164..51c5688 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,9 +1,9 @@
 <view class="Usetop">
     <!-- 双节 -->
-    <image class="Usetop-back" mode="aspectFill" src="https://api.siyuankunlun.com/storage/images/2023/09/22/786a12e4d61acb22bcbb2e90cb7ce023.png"></image>
+    <!-- <image class="Usetop-back" mode="aspectFill" src="https://api.siyuankunlun.com/storage/images/2023/09/22/786a12e4d61acb22bcbb2e90cb7ce023.png"></image> -->
 
     <!-- 默认 -->
-    <!-- <image class="Usetop-back" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/14/uaer_back.jpg"></image> -->
+    <image class="Usetop-back" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/14/uaer_back.jpg"></image>
 
     <view class="Usetop-range" style="padding-top:{{barHeight + jiaonangheight}}px;">
         <view class="Usetop-cont" wx:if="{{userLogin}}">
@@ -11,11 +11,11 @@
                 <image class="Usetop-head-avatar" src="{{avatar ? avatar : '../../static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
 
                 <!-- 双节 -->
-                <image class="userTop-head-frame" src="https://api.siyuankunlun.com/storage/images/2023/09/22/e4e9b20fe4192e5617fa2eaa630afae8.png" mode=""></image>
+                <!-- <image class="userTop-head-frame" src="https://api.siyuankunlun.com/storage/images/2023/09/22/e4e9b20fe4192e5617fa2eaa630afae8.png" mode=""></image> -->
 
                 <!-- 默认 -->
-                <!-- <image wx:if="{{identity.order == '1'}}" class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/19/ancrown_pt.png" mode=""></image>
-                <image wx:else class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/14/ancrown.png" mode=""></image> -->
+                <image wx:if="{{identity.order == '1'}}" class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/19/ancrown_pt.png" mode=""></image>
+                <image wx:else class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/14/ancrown.png" mode=""></image>
             </view>
             <view class="Usetop-text">
                 {{nickName}}
diff --git a/project.config.json b/project.config.json
index 2497210..f4dc761 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-    "description": "项目配置文件",
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "packOptions": {
         "ignore": [],
         "include": []
@@ -37,7 +37,11 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        }
+        },
+        "useStaticServer": true,
+        "checkInvalidKey": true,
+        "disableUseStrict": false,
+        "useCompilerPlugins": false
     },
     "compileType": "miniprogram",
     "libVersion": "2.17.0",
diff --git a/project.private.config.json b/project.private.config.json
index 9652704..dbd17a1 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,6 +1,6 @@
 {
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "sykl-mall",
+    "projectname": "%E9%94%B6%E6%BA%90%E6%98%86%E4%BB%91",
     "setting": {
         "compileHotReLoad": true,
         "urlCheck": true
diff --git a/双节底部图标.txt b/双节底部图标.txt
index 6f0e421..60bfd9c 100644
--- a/双节底部图标.txt
+++ b/双节底部图标.txt
@@ -1,19 +1,17 @@
-"tabBar": {
-        "list": [
+"list": [
             {
                 "pagePath": "pages/index/index",
                 "text": "锶源商城",
-                "iconPath": "/static/tabBarIcon/04.png",
-                "selectedIconPath": "/static/tabBarIcon/04_active.png"
+                "iconPath": "/static/festival/00.png",
+                "selectedIconPath": "/static/festival/00_active.png"
             },
             {
                 "pagePath": "pages/user/index",
                 "text": "锶人中心",
-                "iconPath": "/static/tabBarIcon/02.png",
-                "selectedIconPath": "/static/tabBarIcon/02_active.png"
+                "iconPath": "/static/festival/02.png",
+                "selectedIconPath": "/static/festival/02_active.png"
             }
         ],
         "color": "#b6b9bb",
-        "selectedColor": "#6c78f8",
-        "borderStyle": "white"
-    },
\ No newline at end of file
+        "selectedColor": "#000000",
+        "borderStyle": "white"
\ No newline at end of file