20220602

api/api.js

@@ -2,7 +2,7 @@
 const baseURL = 'https://sqtg.hdlkeji.com' //社区团购
 module.exports = {
   /* 版本号 */
-  Version: '3.0.10',
+  Version: '3.0.6',
   /* 用户登录 */
   weChatLogin: baseURL + '/api/Login/weChatLogin', //微信登录（小程序）
   get_token: baseURL + '/api/Login/get_token', //根据用户ID获取token
@@ -20,6 +20,7 @@ module.exports = {
   Order_address: baseURL + '/api/Order/Order_address', //用户修改收货地址
   Order_payment_method: baseURL + '/api/Order/Order_payment_method', //用户支付方式
   Order_payment: baseURL + '/api/Order/Order_payment', //用户支付
+  Service: baseURL + '/api/Order/Service', //微信支付手续费
   Print: baseURL + '/api/Order/Print', //打印面单
   /* OSS对象存储 */
   upload: baseURL + '/api/Upload/upload', //文件上传

app.wxss

@@ -2,7 +2,7 @@
 /* 引入icofont */
 @import "./styles/icofont.wxss";
 
-.container {
+/* .container {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -10,4 +10,17 @@
   justify-content: space-between;
   padding: 200rpx 0;
   box-sizing: border-box;
-}
+} */
+.container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+} 

compone/count-down/count-down.js

@@ -38,8 +38,8 @@ Component({
 		}
 	},
 	// 样式
-	options:{
-		addGlobalClass:true,
+	options: {
+		addGlobalClass: true,
 	},
 
 	data: {
@@ -47,7 +47,7 @@ Component({
 	},
 
 	lifetimes: {
-		ready(){
+		ready() {
 			this.init();
 		},
 		detached() {
@@ -57,7 +57,7 @@ Component({
 	},
 
 	methods: {
-		start(){
+		start() {
 			this.init();
 		},
 		// 时间格式处理
@@ -98,7 +98,6 @@ Component({
 		init() {
 			timer = setTimeout(() => {
 				if (this.data.endTime < intval) {
-					console.log(123)
 					this.setData({
 						result: this.data.endText
 					})
@@ -130,8 +129,8 @@ Component({
 			this.triggerEvent("countEnd")
 		},
 		// 倒计时进行时函数
-		currentFn(time){
-			this.triggerEvent("currentFn",time)
+		currentFn(time) {
+			this.triggerEvent("currentFn", time)
 		},
 		// 补零操作
 		formatNumber(n) {

compone/navbar/navbar.js

@@ -13,13 +13,15 @@ Component({
     fontColor: {
       type: String,
       value: '#2c2b2b'
-    }
+    },
+    
   },
   data: {
     height: '',
-    //默认值  默认显示左上角
+    //默认值 默认显示左上角 默认返回上一页
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     }
   },
   attached: function () {
@@ -31,6 +33,17 @@ Component({
     this.setData({
       height: app.globalData.height
     })
+    let pages = getCurrentPages();
+    let key = `navbarData.capsuleMode`;
+    if(pages[pages.length - 2]) {
+      this.setData({
+        [key]: 'navBack'
+      })
+    }else{
+      this.setData({
+        [key]: 'navHome'
+      })
+    }
   },
   methods: {
     // 返回上一页面

compone/navbar/navbar.wxml

@@ -3,9 +3,12 @@
   <view class='nav-title' style='line-height: {{height*2 + 44}}px;'>{{navbarData.title}}</view>
   <view style='display: flex; justify-content: space-around;flex-direction: column'>
     <view class='nav-capsule' style='height: {{height*2 + 22}}px;' wx:if='{{navbarData.showCapsule}}'>
-      <view bindtap='_navback' style="margin-top: 30rpx;" wx:if='{{!share}}'>
+      <view bindtap='_navback' style="margin-top: 30rpx;" wx:if="{{navbarData.capsuleMode == 'navBack'}}">
         <image src='/images/fanhui.png' mode='aspectFill' class='back-pre'></image>
       </view>
+      <view bindtap='_backhome' style="margin-top: 30rpx;" wx:if="{{navbarData.capsuleMode == 'navHome'}}">
+        <image src='/images/home.png' mode='aspectFill' class='back-pre'></image>
+      </view>
     </view>
   </view>
 </view>

compone/order-card/order-card.wxml

@@ -10,7 +10,7 @@
 		</view>
 		<!-- 倒计时 -->
 		<view class="late-time" style="color: {{cardData.gang_status == 0?'#989898':''}};">
-			倒计时 {{cardData.count_down}}
+			<count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{cardData.time1 * 1000}}"></count-down>
 		</view>
 		<!-- 用户信息 -->
 		<view class="late-content">
@@ -39,19 +39,19 @@
 		<!-- 商品图片 -->
 		<van-image radius="10" width="115" height="115" src="{{cardData.commodity_list[0].commodity_img}}" />
 		<view class="late1-cont">
-    <!-- 拼团名称 -->
+			<!-- 拼团名称 -->
 			<view class="late1-title">
 				{{cardData.gang_name}}
 			</view>
-      <!-- 进度条 -->
+			<!-- 进度条 -->
 			<view class="late1-progress">
 				<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
 			</view>
-      <!-- 倒计时 -->
+			<!-- 倒计时 -->
 			<view class="late1-time" style="color: {{cardData.gang_status == 0?'#989898':''}};">
-				{{cardData.count_down}}
+				<count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{cardData.time1 * 1000}}"></count-down>
 			</view>
-      <!-- 用户信息 -->
+			<!-- 用户信息 -->
 			<view class="late1-content">
 				<view class="late1-c-b">
 					<van-image round width="50rpx" style="margin-top: 8rpx;" fit="cover" height="50rpx" src="{{cardData.headimg}}" />

packageA/ec-canvas/ec-canvas.wxml

@@ -1,4 +1,4 @@
 <!-- 新的：接口对其了H5 -->
-<canvas type="2d"  style="pointer-events: none;" wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
 <!-- 旧的 -->
-<canvas type="2d" style="pointer-events: none;" wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<canvas wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>

packageA/pages/analysis/analysis.js

@@ -3,6 +3,63 @@ const app = getApp();
 const api = require('../../../api/api.js');
 import * as echarts from '../../ec-canvas/echarts';
 var dataList = [];
+
+function setOption(chart) {
+  let pageArr = getCurrentPages();
+  let data = pageArr[pageArr.length - 1].data;
+  const option = {
+    tooltip: {
+      trigger: 'axis'
+    },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      data: data.xData
+    },
+    yAxis: {
+      show: false
+    },
+    series: [{
+      data: data.yData,
+      type: 'line',
+      smooth: true,
+      symbolSize: 10,
+      lineStyle: {
+        normal: {
+          color: '#FF874E',
+          width: 4
+        }
+      },
+      itemStyle: {
+        borderWidth: 3,
+        borderColor: '',
+        color: '#FF874E'
+      },
+      areaStyle: {
+        color: {
+          type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [{
+              offset: 0,
+              color: '#FF874E' // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: '#FFFFFF' // 100% 处的颜色
+            }
+          ],
+          globalCoord: false // 缺省为 false
+        },
+        opacity: 0.5
+      }
+    }]
+  }
+  chart.setOption(option);
+}
+
 Page({
 
   /**
@@ -12,6 +69,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     fen: ["月", "季度", "年"],
     indexs: 0, //类型（0：月；1：季度；2：年）
@@ -38,6 +96,9 @@ Page({
     Help_sell_ranking: [], //帮卖排名数组
     Supplier_ranking: [], //供货商排名数组
     order_list: [], //订单收入数组
+
+    isLoaded: false,
+    isDisposed: false
   },
   // 切换月/季度/年
   qiehuan(e) {
@@ -114,7 +175,6 @@ Page({
    */
   onLoad: function (options) {
     let that = this;
-    that.echartsComponnet = that.selectComponent('#mychart');
     // 获取分析统计收入
     that.getIncome_list()
     // 获取买家排名
@@ -131,7 +191,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
+    this.ecComponent = this.selectComponent('#mychart-dom-bar');
   },
 
   /**
@@ -227,7 +287,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -275,7 +336,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -323,7 +385,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -385,7 +448,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -433,7 +497,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -481,7 +546,8 @@ Page({
               yData
             })
             dataList = res.data.data.data;
-            that.init_echarts(); //初始化图表
+            // that.init_echarts(); //初始化图表
+            that.init();
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -864,7 +930,7 @@ Page({
   // 初始化图表
   init_echarts() {
     let that = this;
-    that.echartsComponnet.init((canvas, width, height, dpr) => {
+    that.ecComponent.init((canvas, width, height, dpr) => {
       // 初始化图表
       const Chart = echarts.init(canvas, null, {
         width: width,
@@ -929,5 +995,38 @@ Page({
       }]
     }
     return option;
+  },
+
+  // 获取数据后初始化图表
+  init: function () {
+    this.ecComponent.init((canvas, width, height, dpr) => {
+      // 获取组件的 canvas、width、height 后的回调函数
+      // 在这里初始化图表
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr // new
+      });
+      setOption(chart);
+
+      // 将图表实例绑定到 this 上，可以在其他成员函数（如 dispose）中访问
+      this.chart = chart;
+
+      this.setData({
+        isLoaded: true,
+        isDisposed: false
+      });
+
+      // 注意这里一定要返回 chart 实例，否则会影响事件处理等
+      return chart;
+    });
+  },
+  dispose: function () {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+    this.setData({
+      isDisposed: true
+    });
   }
 })

packageA/pages/analysis/analysis.wxml

@@ -40,6 +40,8 @@
       <p wx:if="{{shouzhi == 1}}">{{Expenditure_money}}</p>
     </view>
   </view>
+  <!-- <button bindtap="init" wx:if="{{!isLoaded}}">加载图表</button>
+  <button bindtap="dispose" wx:if="{{isLoaded && !isDisposed}}">释放图表</button> -->
   <!-- 身体-图表 -->
   <view class="body">
     <view class="canv-top">
@@ -57,7 +59,8 @@
     <view style="height: 420rpx;"></view>
     <view class="canvs">
       <view class="container">
-        <ec-canvas style="width: 100%;height: 650rpx;" id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
+        <!-- <ec-canvas wx:if="{{!isDisposed}}" style="width: 100%;height: 650rpx;" id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas> -->
+        <ec-canvas wx:if="{{!isDisposed}}" id="mychart-dom-bar" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>
       </view>
     </view>
     <view class="canv-foot">

packageA/pages/analysis/analysis.wxss

@@ -140,7 +140,7 @@ ec-canvas {
   align-items: center;
 }
 
-.container {
+/* .container {
   position: absolute;
   top: 0;
   bottom: 0;
@@ -152,7 +152,7 @@ ec-canvas {
   justify-content: space-between;
   height: 650rpx;
   padding: 0;
-}
+} */
 
 .canvs {
   width: 710rpx;

packageA/pages/rank/rank.js

@@ -13,6 +13,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '买家排名', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     filterType: 0, //过滤类型（0：按天；1：按月；2：按季度；3：按年）
     enterType: 0, //进入类型（0：买家排行；1：商品排行；2：帮卖排行；3：供应商排名；4：订单收入对比；5：订单支出对比
@@ -178,6 +179,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -192,6 +194,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -199,7 +202,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -214,6 +217,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -228,6 +232,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -235,7 +240,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -264,6 +269,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -278,6 +284,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -285,7 +292,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 2) {
@@ -300,6 +307,7 @@ Page({
           quarter: that.data.quarter
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -314,6 +322,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -321,7 +330,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -336,6 +345,7 @@ Page({
           year: that.data.year
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -350,6 +360,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -357,7 +368,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -386,6 +397,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -400,6 +412,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -407,7 +420,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -422,6 +435,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -436,6 +450,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -443,7 +458,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -472,6 +487,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -486,6 +502,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -493,7 +510,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -508,6 +525,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -522,6 +540,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -529,7 +548,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -558,6 +577,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -584,6 +604,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -591,7 +612,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 2) {
@@ -606,6 +627,7 @@ Page({
           quarter: that.data.quarter
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -632,6 +654,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -639,7 +662,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -654,6 +677,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -680,6 +704,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -687,7 +712,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -716,6 +741,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -742,6 +768,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -749,7 +776,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 2) {
@@ -764,6 +791,7 @@ Page({
           quarter: that.data.quarter
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -790,6 +818,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -797,7 +826,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -812,6 +841,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             let arr = res.data.data.data;
@@ -838,6 +868,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -845,7 +876,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -943,6 +974,7 @@ Page({
           month: year + '-' + month
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -957,6 +989,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -964,7 +997,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     } else if (that.data.filterType == 3) {
@@ -979,6 +1012,7 @@ Page({
           year: year
         },
         success(res) {
+          wx.hideLoading()
           // console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -993,6 +1027,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -1000,9 +1035,94 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
   },
+  // 显示选择器
+  showtime() {
+    this.setData({
+      show: true
+    })
+  },
+  // 确认月
+  oktime(e) {
+    let that = this;
+    let timec = e.detail;
+    let date = new Date(timec);
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    that.setData({
+      year: year,
+      month: month,
+      show: false
+    })
+    if (that.data.enterType == 0) {
+      // 获取买家排名
+      that.getBuyer_ranking()
+    } else if (that.data.enterType == 1) {
+      // 获取商品排名
+      that.getCommodity_ranking()
+    } else if (that.data.enterType == 2) {
+      // 获取帮卖排名
+      that.getHelp_sell_ranking()
+    } else if (that.data.enterType == 3) {
+      // 获取供应商排名
+      that.getSupplier_ranking()
+    } else if (that.data.enterType == 4) {
+      // 获取统计分析收入
+      that.getIncome_list()
+      // 获取订单收入列表
+      that.getorder_list()
+    } else if (that.data.enterType == 5) {
+      // 获取统计分析支出
+      that.getExpenditure_list()
+    }
+  },
+  // 确认季度
+  okquarter(e) {
+    let that = this;
+    let quarter = e.detail.index + 1;
+    that.setData({
+      quarter: quarter,
+      show: false
+    })
+  },
+  // 确认年
+  okyear(e) {
+    let that = this;
+    let year = e.detail.value;
+    that.setData({
+      year: year,
+      show: false
+    })
+    if (that.data.enterType == 0) {
+      // 获取买家排名
+      that.getBuyer_ranking()
+    } else if (that.data.enterType == 1) {
+      // 获取商品排名
+      that.getCommodity_ranking()
+    } else if (that.data.enterType == 2) {
+      // 获取帮卖排名
+      that.getHelp_sell_ranking()
+    } else if (that.data.enterType == 3) {
+      // 获取供应商排名
+      that.getSupplier_ranking()
+    } else if (that.data.enterType == 4) {
+      // 获取统计分析收入
+      that.getIncome_list()
+      // 获取订单收入列表
+      that.getorder_list()
+    } else if (that.data.enterType == 5) {
+      // 获取统计分析支出
+      that.getExpenditure_list()
+    }
+  },
+  // 关闭选择器
+  offtime() {
+    this.setData({
+      show: false
+    })
+  },
 })

packageA/pages/rank/rank.wxml

@@ -3,16 +3,20 @@
 <!-- 弹出层 -->
 <van-popup show="{{ show }}" position="bottom" custom-style="height: 32%;box-shadow: 10px -5px 5px #c9c9c960;" overlay="{{false}}" bind:close="onClose">
   <!-- 年月选择器 -->
-  <van-datetime-picker wx:if="{{indexs == 0}}" type="year-month" item-height="34" value="{{ currentDate }}" bind:cancel="offtime" min-date="{{ minDate }}" bind:confirm="oktime" />
+  <van-datetime-picker wx:if="{{filterType == 1}}" type="year-month" item-height="34" value="{{ currentDate }}" bind:cancel="offtime" min-date="{{ minDate }}" bind:confirm="oktime" />
   <!-- 季度选择器 -->
-  <van-picker wx:if="{{indexs == 1}}" show-toolbar columns="{{ quarters }}" item-height="34" bind:cancel="offtime" bind:confirm="okquarter" />
+  <van-picker wx:if="{{filterType == 2}}" show-toolbar columns="{{ quarters }}" item-height="34" bind:cancel="offtime" bind:confirm="okquarter" />
   <!-- 年选择器 -->
-  <van-picker wx:if="{{indexs == 2}}" show-toolbar columns="{{ years }}" item-height="34" bind:cancel="offtime" bind:confirm="okyear" />
+  <van-picker wx:if="{{filterType == 3}}" show-toolbar columns="{{ years }}" item-height="34" bind:cancel="offtime" bind:confirm="okyear" />
 </van-popup>
 <view class="cont">
   <!-- 过滤条件 -->
   <view class="type-class">
-    <view>{{year}}年{{month}}月<image style="height: 12rpx;width: 20rpx;margin-left: 20rpx;" bindtap="showtime" src="/images/xia.png"></image>
+    <view bindtap="showtime" wx:if="{{filterType == 1}}">{{year}}年{{month}}月<image style="height: 12rpx;width: 20rpx;margin-left: 20rpx;" src="/images/xia.png"></image>
+    </view>
+    <view bindtap="showtime" wx:if="{{filterType == 2}}">第{{quarter}}季度<image style="height: 12rpx;width: 20rpx;margin-left: 20rpx;" src="/images/xia.png"></image>
+    </view>
+    <view bindtap="showtime" wx:if="{{filterType == 3}}">{{year}}年<image style="height: 12rpx;width: 20rpx;margin-left: 20rpx;" src="/images/xia.png"></image>
     </view>
     <view>
       <!-- <view class="{{filterType==0?'xuan':'wxuan'}}" data-type="0" bindtap="changeFilterType">按天</view> -->

packageA/pages/rank/rank.wxss

@@ -55,7 +55,7 @@ page {
   justify-content: space-around;
   align-items: center;
 }
-.container {
+/* .container {
   position: absolute;
   top: 0;
   bottom: 0;
@@ -67,7 +67,7 @@ page {
   justify-content: space-between;
   height: 650rpx;
   padding: 0;
-}
+} */
 
 .canvs {
   width: 710rpx;

pages/addaddress/addaddress.js

@@ -9,6 +9,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '新增地址', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     genders: ['男士', '女士'],
     type: '', //类型
@@ -36,6 +37,7 @@ Page({
         navbarData: {
           showCapsule: 1,
           title: '修改地址',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         }
       })
     } else {
@@ -44,6 +46,7 @@ Page({
         navbarData: {
           showCapsule: 1,
           title: '新增地址',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         }
       })
     }

pages/addbankcard/addbankcard.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
   },
 

pages/adddeliveryaddress/adddeliveryaddress.js

@@ -9,6 +9,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '新增提货点', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     genders: ['男士', '女士'],
     type: '', //类型
@@ -37,6 +38,7 @@ Page({
         navbarData: {
           showCapsule: 1,
           title: '修改地址',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         }
       })
     } else {
@@ -45,6 +47,7 @@ Page({
         navbarData: {
           showCapsule: 1,
           title: '新增地址',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         }
       })
     }

pages/addtogood/addtogood.js

@@ -1,6 +1,7 @@
 // pages/addtogood/addtogood.js
 const app = getApp();
 const api = require('../../api/api');
+const storageManager = require("../../utils/storage-manager.js");
 Page({
 
   /**
@@ -10,7 +11,9 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '添加商品', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
+    enterType: '', //进入方式
     arealength: 0,
     showLadderPrice: false, //阶梯价弹出层显示
     showCategory: false, //分类弹出层显示
@@ -39,6 +42,9 @@ Page({
    */
   onLoad(options) {
     let that = this;
+    that.setData({
+      enterType: options.enterType
+    })
     // 获取分类列表
     wx.showLoading({
       title: '加载中',
@@ -142,10 +148,10 @@ Page({
   uploadSmallImage() {
     let that = this;
     if (that.data.imageList.length < 5) {
-      wx.showLoading({
-        title: '文件上传中',
-        mask: true
-      })
+      // wx.showLoading({
+      //   title: '文件上传中',
+      //   mask: true
+      // })
       wx.request({
         url: api.getSignedUrl,
         data: {
@@ -160,6 +166,10 @@ Page({
               success: (img) => {
                 console.log(img);
                 let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+                wx.showLoading({
+                  title: '文件上传中',
+                  mask: true
+                })
                 wx.uploadFile({
                   filePath: img.tempFiles[0].tempFilePath,
                   name: 'file',
@@ -226,47 +236,81 @@ Page({
   // 打开规格弹出层
   showSpecificationPopup() {
     let that = this;
-    if (that.data.specifications.length == 0) {
-      that.setData({
-        showSpecification: true,
-        specifications: [{
-            title: '',
-            price: ''
-          },
-          {
-            title: '',
-            price: ''
-          }
-        ]
-      })
+    if (that.data.prices.length == 0) {
+      if (that.data.specifications.length == 0) {
+        that.setData({
+          showSpecification: true,
+          specifications: [{
+              title: '',
+              price: ''
+            },
+            {
+              title: '',
+              price: ''
+            }
+          ]
+        })
+      } else {
+        that.setData({
+          showSpecification: true
+        })
+      }
     } else {
-      that.setData({
-        showSpecification: true
+      wx.showModal({
+        title: '提示',
+        content: '规格和阶梯价不可同时设置，如需设置规格，则会清除阶梯价内所有设置',
+        success(res) {
+          if (res.confirm) {
+            if (that.data.specifications.length == 0) {
+              that.setData({
+                prices: [],
+                showSpecification: true,
+                specifications: [{
+                  title: '',
+                  price: ''
+                },
+                {
+                  title: '',
+                  price: ''
+                }
+              ]
+              })
+            } else {
+              that.setData({
+                prices: [],
+                showSpecification: true
+              })
+            }
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
       })
     }
   },
   // 关闭规格弹出层
   closeSpecificationPopup() {
     let that = this;
-    if (that.data.specifications[0].price != '' && that.data.specifications[0].title != '') {
+    let isOK = that.judgeNoyNullSpecifications(that.data.specifications);
+    if (isOK) {
       that.setData({
         specificationText: that.data.specifications[0].title + '/' + that.data.specifications[0].price + '加币',
         price: Number(that.data.specifications[0].price),
         showSpecification: false
       })
-    }else {
+    } else {
       wx.showToast({
         title: '您未完整录入数据',
         icon: 'none',
         mask: true,
         success() {
-          setTimeout(()=>{
+          setTimeout(() => {
             that.setData({
               specificationText: '统一规格',
               specifications: [],
               showSpecification: false
             })
-          })
+          }, 1500)
         }
       })
     }
@@ -431,9 +475,30 @@ Page({
   },
   // 关闭阶梯价弹出层
   closeLadderPricePopup() {
-    this.setData({
-      showLadderPrice: false
-    })
+    let that = this;
+    let isOK = that.judgeNoyNullStepPrice(that.data.prices);
+    if (isOK) {
+      that.setData({
+        specificationText: '统一规格',
+        price: Number(that.data.prices[0].price),
+        showLadderPrice: false
+      })
+    } else {
+      wx.showToast({
+        title: '您未完整录入数据',
+        icon: 'none',
+        mask: true,
+        success() {
+          setTimeout(() => {
+            that.setData({
+              specificationText: '统一规格',
+              prices: [],
+              showLadderPrice: false
+            })
+          }, 1500)
+        }
+      })
+    }
   },
   // 阶梯价个数输入
   ladderPriceNumInput(e) {
@@ -524,50 +589,65 @@ Page({
       })
       return
     }
-    // 库存必录校验
-    if (that.data.stock == '') {
-      wx.showToast({
-        title: '库存未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
+    // 库存
+    let stock = that.data.stock;
+    if (stock == '') {
+      stock = '99999999';
     }
     // 起购数量必录校验
-    if (that.data.startingPurchase == '') {
-      wx.showToast({
-        title: '起购数量未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    /*
+         if (that.data.startingPurchase == '') {
+          wx.showToast({
+            title: '起购数量未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } 
+        */
     // 限购数量必录校验
-    if (that.data.purchaseRestrictionsNumber == '') {
-      wx.showToast({
-        title: '限购数量未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    /*
+         if (that.data.purchaseRestrictionsNumber == '') {
+          wx.showToast({
+            title: '限购数量未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } 
+        */
     // 限购次数必录校验
-    if (that.data.purchaseRestrictionsSecond == '') {
-      wx.showToast({
-        title: '限购次数未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    /*
+         if (that.data.purchaseRestrictionsSecond == '') {
+          wx.showToast({
+            title: '限购次数未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } 
+        */
     // 起购团数必录校验
-    if (that.data.startingPurchaseNumber == '') {
-      wx.showToast({
-        title: '起购团数未录入',
-        icon: 'none',
-        mask: true
+    /*
+         if (that.data.startingPurchaseNumber == '') {
+          wx.showToast({
+            title: '起购团数未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } 
+        */
+    // 如果不录规格也不录阶梯价-规格为统一规格，价格为售价
+    if (that.data.specifications.length == 0 && that.data.prices.length == 0) {
+      let list = that.data.specifications;
+      let obj = {};
+      obj.title = '统一规格';
+      obj.price = that.data.price;
+      list.push(obj);
+      that.setData({
+        specifications: list
       })
-      return
     }
     wx.showLoading({
       title: '提交中',
@@ -586,7 +666,7 @@ Page({
         scribe_price: that.data.scribePrice,
         specifications: that.data.specifications,
         price: that.data.price,
-        stock: that.data.stock,
+        stock: stock,
         classification_id: that.data.categorys[that.data.categoryIndex].id,
         commodity_warehouse: that.data.isAddToGoodsBank,
         starting_purchase: that.data.startingPurchase,
@@ -604,11 +684,39 @@ Page({
             icon: 'success',
             mask: true,
             success() {
-              setTimeout(() => {
-                wx.navigateBack({
-                  delta: 1,
+              if (that.data.enterType == 'announce') {
+                // 获取商品详情
+                let id = Number(res.data.data); //商品id
+                wx.request({
+                  url: api.Commodity_info,
+                  header: {
+                    'Authorization': wx.getStorageSync('token')
+                  },
+                  data: {
+                    id: id
+                  },
+                  success(ress) {
+                    console.log(ress);
+                    if (ress.data.code === 1) {
+                      let arr = [];
+                      let obj = ress.data.data;
+                      arr.push(obj);
+                      storageManager.set('subPageResult', arr);
+                      setTimeout(() => {
+                        wx.navigateBack({
+                          delta: 1,
+                        })
+                      }, 1500)
+                    }
+                  }
                 })
-              }, 1500)
+              } else {
+                setTimeout(() => {
+                  wx.navigateBack({
+                    delta: 1,
+                  })
+                }, 1500)
+              }
             }
           })
         } else {
@@ -631,5 +739,25 @@ Page({
         // wx.hideLoading()
       }
     })
-  }
+  },
+  // 阶梯价-判断不为空
+  judgeNoyNullStepPrice(arr) {
+    let isOK = true;
+    for (let i = 0; i < arr.length; i++) {
+      if (arr[i].title == '' || arr[i].price == '') {
+        isOK = false;
+      }
+    }
+    return isOK;
+  },
+  // 规格-判断不为空
+  judgeNoyNullSpecifications(arr) {
+    let isOK = true;
+    for (let i = 0; i < arr.length; i++) {
+      if (arr[i].number == '' || arr[i].price == '') {
+        isOK = false;
+      }
+    }
+    return isOK;
+  },
 })

pages/addtogood/addtogood.wxml

@@ -16,6 +16,7 @@
   <!-- 商品简介 -->
   <view class="group">
     <view class="group-title">
+      <p>*</p>
       <p>商品简介</p>
     </view>
     <view class="group-content">
@@ -40,6 +41,7 @@
   <view class="card">
     <view class="card-row">
       <view class="left">
+        <text style="color: red;">*</text>
         <text>划线价格</text>
       </view>
       <view class="right">
@@ -70,14 +72,16 @@
     </view>
     <view class="card-row">
       <view class="left">
+        <text style="color: red;">*</text>
         <text>库存</text>
       </view>
       <view class="right">
-        <input type="digit" value="{{stock}}" bindinput="inputStock" placeholder="请输入库存" style="text-align: right;" />
+        <input type="number" value="{{stock}}" bindinput="inputStock" placeholder="无限" style="text-align: right;" />
       </view>
     </view>
     <view class="card-row" bindtap="showCategoryPopup">
       <view class="left">
+        <text style="color: red;">*</text>
         <text>分类</text>
       </view>
       <view class="right">
@@ -87,6 +91,7 @@
     </view>
     <view class="card-row">
       <view class="left">
+        <text style="color: red;">*</text>
         <text>是否添加到商品库</text>
       </view>
       <view class="right">
@@ -208,10 +213,10 @@
     <view class="popu-info" wx:for="{{prices}}" wx:key="index">
       <image src="/images/dayudengyu.png"></image>
       <view class="popu-num">
-        <input type="text" placeholder="输入个数/个" bindinput="ladderPriceNumInput" data-index="{{index}}" value="{{item.number}}" placeholder-style="color:#989898;font-size:28rpx;" />
+        <input type="number" placeholder="输入个数/个" bindinput="ladderPriceNumInput" data-index="{{index}}" value="{{item.number}}" placeholder-style="color:#989898;font-size:28rpx;" />
       </view>
       <view class="popu-price">
-        <input type="text" placeholder="金额/加币" bindinput="ladderPricePriceInput" data-index="{{index}}" value="{{item.price}}" placeholder-style="color:#989898;font-size:28rpx;" />
+        <input type="digit" placeholder="金额/加币" bindinput="ladderPricePriceInput" data-index="{{index}}" value="{{item.price}}" placeholder-style="color:#989898;font-size:28rpx;" />
       </view>
       <image src="/images/jian.png" bindtap="delbulk" data-index="{{index}}"></image>
     </view>

pages/addtogood/addtogood.wxss

@@ -166,9 +166,10 @@ page {
   box-shadow: 0px -2px 28px -12px #00000030;
   display: flex;
   justify-content: center;
+  z-index: 9;
 }
 
-.foot>button {
+.foot button {
   width: 622rpx;
   height: 74rpx;
   background-color: #FF874E;

pages/adminlist/adminlist.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '切换账号', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     Administrators_list: [], //管理员列表
   },

pages/adminlist/adminlist.wxml

@@ -5,7 +5,7 @@
     <van-image round width="108rpx" height="108rpx" src="{{item.headimg}}" />
     <text style="margin-left: 20rpx;">{{item.name}}</text>
     <view style="flex: 1;"></view>
-    <view class="btn" data-id="{{item.admin_id}}" catchtap="switchAccount">切换此账号</view>
+    <view class="btn" data-id="{{item.user_id}}" catchtap="switchAccount">切换此账号</view>
   </view>
 </view>
 <van-empty wx:if="{{Administrators_list.length == 0}}" description="暂无数据" />

pages/adminmanage/adminmanage.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '管理员管理', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     Administrators_list: [], //管理员列表
   },

pages/announce/announce.js

@@ -13,6 +13,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '创建新拼团', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     index: 0, //当前步骤（0-拼团介绍；1-编辑商品；2-规则设置）
     type: '', //类型（add-创建新拼团；copy-复制往期拼团；edit-编辑拼团；）
@@ -51,11 +52,7 @@ Page({
     minutes: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59'],
     // 物流方式相关-开始
     showShippingMethods: false, //显示物流方式
-    shippingMethods: [{
-        name: '没有物流',
-        index: 0,
-        className: 'actions-first-child'
-      },
+    shippingMethods: [
       {
         name: '取货点自提',
         index: 1,
@@ -91,6 +88,8 @@ Page({
     comment: 0,
     seller_forwarding: 0,
     receiving_information: 0,
+
+    wxpayservice: '', //微信支付手续费
   },
   /**
    * 生命周期函数--监听页面加载
@@ -106,7 +105,8 @@ Page({
       that.setData({
         navbarData: {
           showCapsule: 1,
-          title: '编辑拼团'
+          title: '编辑拼团',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         }
       })
     }
@@ -127,12 +127,31 @@ Page({
         success(res) {
           console.log(res);
           if (res.data.code === 1) {
+            // 对拼团大图/拼团小图/拼团视频做非空校验
+            let gang_video = res.data.data.gang_video;
+            let gang_big_img = res.data.data.gang_big_img;
+            let gang_small_img = res.data.data.gang_small_img;
+            if(gang_video == null) {
+              gang_video = [];
+            }else{
+              gang_video = [gang_video];
+            }
+            if(gang_big_img == null) {
+              gang_big_img = [];
+            }else{
+              gang_big_img = [gang_big_img];
+            }
+            if(gang_small_img[0] == '') {
+              gang_small_img = [];
+            }else{
+              gang_small_img = gang_small_img;
+            }
             that.setData({
               groupName: res.data.data.gang_name,
               groupDesc: res.data.data.gang_describe,
-              videoList: [res.data.data.gang_video],
-              bigImageList: [res.data.data.gang_big_img],
-              smallImageList: res.data.data.gang_small_img,
+              videoList: gang_video,
+              bigImageList: gang_big_img,
+              smallImageList: gang_small_img,
               startTuanTime: res.data.data.opening_time,
               endTuanTime: res.data.data.closing_time,
               logistics_mode: res.data.data.logistics_mode,
@@ -200,6 +219,8 @@ Page({
         }
       })
     }
+    // 获取微信支付手续费
+    that.getWXPayServiceCharge();
   },
 
   /**
@@ -308,10 +329,10 @@ Page({
   uploadBigImage() {
     let that = this;
     if (that.data.bigImageList.length === 0) {
-      wx.showLoading({
-        title: '文件上传中',
-        mask: true
-      })
+      // wx.showLoading({
+      //   title: '文件上传中',
+      //   mask: true
+      // })
       wx.request({
         url: api.getSignedUrl,
         data: {
@@ -325,6 +346,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -370,10 +395,10 @@ Page({
   uploadSmallImage() {
     let that = this;
     if (that.data.smallImageList.length < 5) {
-      wx.showLoading({
-        title: '文件上传中',
-        mask: true
-      })
+      // wx.showLoading({
+      //   title: '文件上传中',
+      //   mask: true
+      // })
       wx.request({
         url: api.getSignedUrl,
         data: {
@@ -387,6 +412,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -432,10 +461,10 @@ Page({
   uploadVideo() {
     let that = this;
     if (that.data.videoList.length === 0) {
-      wx.showLoading({
-        title: '文件上传中',
-        mask: true
-      })
+      // wx.showLoading({
+      //   title: '文件上传中',
+      //   mask: true
+      // })
       wx.request({
         url: api.getSignedUrl,
         data: {
@@ -449,6 +478,10 @@ Page({
             success: (video) => {
               console.log(video);
               let key = "video/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.mp4';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: video.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -549,7 +582,7 @@ Page({
   // 创建新商品
   createNewGood() {
     wx.navigateTo({
-      url: '/pages/addtogood/addtogood',
+      url: '/pages/addtogood/addtogood?enterType=announce',
     })
   },
   // 点击切换类型
@@ -958,10 +991,10 @@ Page({
             src: res.tempFilePaths[0], // 图片路径
             success(result) {
               console.log(result);
-              wx.showLoading({
-                title: '文件上传中',
-                mask: true
-              })
+              // wx.showLoading({
+              //   title: '文件上传中',
+              //   mask: true
+              // })
               wx.request({
                 url: api.getSignedUrl,
                 data: {
@@ -970,6 +1003,10 @@ Page({
                 success: (oss) => {
                   console.log(oss);
                   let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+                  wx.showLoading({
+                    title: '文件上传中',
+                    mask: true
+                  })
                   wx.uploadFile({
                     filePath: result.tempFilePath,
                     name: 'file',
@@ -1023,10 +1060,10 @@ Page({
             src: res.tempFilePaths[0], // 图片路径
             success(result) {
               console.log(result);
-              wx.showLoading({
-                title: '文件上传中',
-                mask: true
-              })
+              // wx.showLoading({
+              //   title: '文件上传中',
+              //   mask: true
+              // })
               wx.request({
                 url: api.getSignedUrl,
                 data: {
@@ -1035,6 +1072,10 @@ Page({
                 success: (oss) => {
                   console.log(oss);
                   let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+                  wx.showLoading({
+                    title: '文件上传中',
+                    mask: true
+                  })
                   wx.uploadFile({
                     filePath: result.tempFilePath,
                     name: 'file',
@@ -1097,10 +1138,10 @@ Page({
             src: res.tempFilePaths[0], // 图片路径
             success(result) {
               console.log(result);
-              wx.showLoading({
-                title: '文件上传中',
-                mask: true
-              })
+              // wx.showLoading({
+              //   title: '文件上传中',
+              //   mask: true
+              // })
               wx.request({
                 url: api.getSignedUrl,
                 data: {
@@ -1109,6 +1150,10 @@ Page({
                 success: (oss) => {
                   console.log(oss);
                   let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+                  wx.showLoading({
+                    title: '文件上传中',
+                    mask: true
+                  })
                   wx.uploadFile({
                     filePath: result.tempFilePath,
                     name: 'file',
@@ -1162,10 +1207,10 @@ Page({
             src: res.tempFilePaths[0], // 图片路径
             success(result) {
               console.log(result);
-              wx.showLoading({
-                title: '文件上传中',
-                mask: true
-              })
+              // wx.showLoading({
+              //   title: '文件上传中',
+              //   mask: true
+              // })
               wx.request({
                 url: api.getSignedUrl,
                 data: {
@@ -1174,6 +1219,10 @@ Page({
                 success: (oss) => {
                   console.log(oss);
                   let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+                  wx.showLoading({
+                    title: '文件上传中',
+                    mask: true
+                  })
                   wx.uploadFile({
                     filePath: result.tempFilePath,
                     name: 'file',
@@ -1338,30 +1387,30 @@ Page({
       })
       return
     }
-    if (that.data.bigImageList.length == 0) {
-      wx.showToast({
-        title: '拼团大图未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (gang_small_img == '') {
-      wx.showToast({
-        title: '拼团小图未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.videoList.length == 0) {
-      wx.showToast({
-        title: '拼团视频未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    /*     if (that.data.bigImageList.length == 0) {
+          wx.showToast({
+            title: '拼团大图未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } */
+    /*     if (gang_small_img == '') {
+          wx.showToast({
+            title: '拼团小图未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } */
+    /*     if (that.data.videoList.length == 0) {
+          wx.showToast({
+            title: '拼团视频未录入',
+            icon: 'none',
+            mask: true
+          })
+          return
+        } */
     if (opening_time == '') {
       wx.showToast({
         title: '拼团开团时间未录入',
@@ -1386,14 +1435,14 @@ Page({
       })
       return
     }
-    if (expected_arrival_time == '') {
-      wx.showToast({
-        title: '预计到货时间未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    // if (expected_arrival_time == '') {
+    //   wx.showToast({
+    //     title: '预计到货时间未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
     if (commodity_id_array.length == 0) {
       wx.showToast({
         title: '拼团商品未录入',
@@ -1408,7 +1457,7 @@ Page({
       title: '提交中',
       mask: true
     })
-    if(that.data.type == 'edit') {
+    if (that.data.type == 'edit') {
       wx.request({
         url: api.Gang_edit,
         header: {
@@ -1481,7 +1530,7 @@ Page({
           // wx.hideLoading()
         }
       })
-    }else {
+    } else {
       wx.request({
         url: api.Gang_add,
         header: {
@@ -1556,5 +1605,29 @@ Page({
         }
       })
     }
-  }
+  },
+  // 获取微信支付手续费
+  getWXPayServiceCharge() {
+    let that = this;
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
+    wx.request({
+      url: api.Service,
+      header: {
+        'Authorization': wx.getStorageSync('token')
+      },
+      method: 'POST',
+      success(res) {
+        wx.hideLoading()
+        that.setData({
+          wxpayservice: res.data.data * 100
+        })
+      },
+      fail(err) {
+        wx.hideLoading()
+      }
+    })
+  },
 })

pages/announce/announce.wxml

@@ -214,7 +214,6 @@
       <view class="row">
         <p class="row-prefix">*</p>
         <p class="row-title">开团时间</p>
-        <!-- <p class="row-content">请选择开团时间</p> -->
         <date-time-picker value="{{startTuanTime === '' ? filter.currentDateTime() : startTuanTime}}" bind:change="changeStartTuanTime">
           <p class="row-content">{{startTuanTime === '' ? '请选择开团时间' : startTuanTime}}</p>
         </date-time-picker>
@@ -223,7 +222,6 @@
       <view class="row">
         <p class="row-prefix">*</p>
         <p class="row-title">截团时间</p>
-        <!-- <p class="row-content">请选择截团时间</p> -->
         <date-time-picker value="{{endTuanTime === '' ? filter.currentDateTime() : endTuanTime}}" bind:change="changEndTuanTime">
           <p class="row-content">{{endTuanTime === '' ? '请选择截团时间' : endTuanTime}}</p>
         </date-time-picker>
@@ -232,10 +230,10 @@
       <view class="row" catchtap="openShippingMethods">
         <p class="row-prefix">*</p>
         <p class="row-title">物流方式</p>
-        <p class="row-content">{{logistics_mode === '' ? '请选择' : shippingMethods[logistics_mode].name}}</p>
+        <p class="row-content">{{logistics_mode === '' ? '请选择' : shippingMethods[logistics_mode - 1].name}}</p>
         <van-icon class="row-suffix" name="arrow" size="28rpx" color="#656565" />
       </view>
-      <view class="row" wx:if="{{type != 'edit'}}">
+      <view class="row" wx:if="{{type != 'edit' && (logistics_mode == 1 || logistics_mode == 2)}}">
         <p class="row-prefix">*</p>
         <p class="row-title">添加提货点</p>
         <image class="row-suffix" src="../../images/tianjia.png" catchtap="addPickAddress"></image>
@@ -256,7 +254,6 @@
       </view>
       <view class="row">
         <p class="row-title">预计到货时间</p>
-        <!-- <p class="row-content">请选择预计到货时间</p> -->
         <date-time-picker value="{{daoHuoTime === '' ? filter.currentDateTime() : daoHuoTime}}" bind:change="changeDaoHuoTime">
           <p class="row-content">{{daoHuoTime === '' ? '请选择预计到货时间' : daoHuoTime}}</p>
         </date-time-picker>
@@ -282,7 +279,7 @@
       </view>
       <view class="row2">
         <p class="row2-title">是否开启微信支付</p>
-        <p class="row2-content">+XX%服务费</p>
+        <p class="row2-content">+{{wxpayservice}}%服务费</p>
         <van-switch checked="{{ wechat_payment }}" active-value="{{1}}" inactive-value="{{0}}" active-color="#FF874E" inactive-color="#656565" size="19" bind:change="changeIsOpenWXPay" />
       </view>
       <view class="row2">
@@ -308,7 +305,7 @@
     </view>
   </view>
 </view>
-<!-- 底部按钮 -->
+<!-- 底部按钮-管理模式 -->
 <view class="jieshao-foot" wx:if="{{openManageMode}}">
   <view class="manage-checkbox">
     <view class="manage-checkbox-inner">
@@ -329,9 +326,10 @@
     </view>
   </view>
 </view>
+<!-- 底部按钮-下一步与确认发布 -->
 <view class="jieshao-foot" wx:if="{{!openManageMode}}">
-  <button bindtap="nextone" wx:if="{{index === 0 || index === 1}}">下一步</button>
-  <button wx:if="{{index === 2}}" catchtap="submit">确认发布</button>
+  <view class="jieshao-foot-btn" bindtap="nextone" wx:if="{{index === 0 || index === 1}}">下一步</view>
+  <view class="jieshao-foot-btn" wx:if="{{index === 2}}" catchtap="submit">确认发布</view>
 </view>
 <!-- 弹出层 -->
 <!-- 时间日期选择器(开团时间)-start -->

pages/announce/announce.wxss

@@ -114,7 +114,7 @@ page {
 }
 
 .jieshao-foot {
-  width: 100%;
+  width: 750rpx;
   bottom: 0;
   height: 158rpx;
   background-color: white;
@@ -122,9 +122,10 @@ page {
   box-shadow: 0px -2px 28px -12px #00000030;
   display: flex;
   justify-content: center;
+  z-index: 99;
 }
 
-.jieshao-foot>button {
+.jieshao-foot-btn {
   width: 622rpx;
   height: 74rpx;
   background-color: #FF874E;
@@ -136,6 +137,7 @@ page {
   margin-top: 22rpx;
   font-size: 28rpx;
   font-weight: 600;
+  /* z-index: 99; */
 }
 
 .manage-checkbox {

pages/authorizesuccessful/authorizesuccessful.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
   },
 

pages/bankcard/bankcard.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '银行卡管理', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     bankcard: [{
       name: "招商银行",

pages/bindadmin/bindadmin.js

@@ -8,7 +8,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 0, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '成为管理员' //导航栏 中间的标题
+      title: '成为管理员', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     user_name: '', //邀请人姓名
     user_avatar: '', //头像

pages/cardverify/cardverify.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '订单核销', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     card_number: '', //卡券号
     code_result: '', //扫码返回结果

pages/company/company.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '提现申请', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     chang: 0,
     fileList: [],

pages/companydetail/companydetail.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '收支明细', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //拼团id
     gang_info: {},

pages/companydetailgroup/companydetailgroup.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '收支明细', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     filterTime: ['全部', '近7天', '近30天', '近90天'], //过滤时间
     filterIndex: 0, //过滤索引

pages/companydetailinfo/companydetailinfo.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '收支明细', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //订单id
     billdata: {}

pages/companyrecord/companyrecord.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '提现记录', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tab: [
       "全部", "提现中", "提现成功"

pages/confirmorder/confirmorder.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '确认订单', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabType: 'wuliu', //tab类型
     showBottomBar: true, //显示底部栏
@@ -40,6 +41,8 @@ Page({
     peisongIndex: 0,
 
     order_id: 0, //订单ID
+
+    wxpayservice: '', //微信支付手续费
   },
 
   /**
@@ -88,6 +91,7 @@ Page({
         },
         method: 'POST',
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -102,6 +106,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -109,7 +114,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -126,6 +131,7 @@ Page({
         },
         method: 'POST',
         success(res) {
+          wx.hideLoading()
           console.log(res);
           if (res.data.code === 1) {
             that.setData({
@@ -140,6 +146,7 @@ Page({
           }
         },
         fail(err) {
+          wx.hideLoading()
           wx.showToast({
             title: '发起网络请求失败',
             icon: 'none',
@@ -147,7 +154,7 @@ Page({
           })
         },
         complete() {
-          wx.hideLoading()
+          // wx.hideLoading()
         }
       })
     }
@@ -303,6 +310,7 @@ Page({
           },
           method: 'POST',
           success(res) {
+            wx.hideLoading()
             console.log(res);
             if (res.data.code === 1) {
               let order_id = res.data.data;
@@ -319,6 +327,7 @@ Page({
             }
           },
           fail(err) {
+            wx.hideLoading()
             wx.showToast({
               title: '发起网络请求失败',
               icon: 'none',
@@ -326,7 +335,7 @@ Page({
             })
           },
           complete() {
-            wx.hideLoading()
+            // wx.hideLoading()
           }
         })
       } else if (logistics_mode == 1) {
@@ -349,6 +358,7 @@ Page({
           },
           method: 'POST',
           success(res) {
+            wx.hideLoading()
             console.log(res);
             if (res.data.code === 1) {
               let order_id = res.data.data;
@@ -365,6 +375,7 @@ Page({
             }
           },
           fail(err) {
+            wx.hideLoading()
             wx.showToast({
               title: '发起网络请求失败',
               icon: 'none',
@@ -372,7 +383,7 @@ Page({
             })
           },
           complete() {
-            wx.hideLoading()
+            // wx.hideLoading()
           }
         })
       }
@@ -399,6 +410,7 @@ Page({
       },
       method: 'POST',
       success(res) {
+        wx.hideLoading()
         console.log(res);
         if (res.data.code === 1) {
           that.setData({
@@ -415,6 +427,7 @@ Page({
         }
       },
       fail(err) {
+        wx.hideLoading()
         wx.showToast({
           title: '发起网络请求失败',
           icon: 'none',
@@ -422,7 +435,7 @@ Page({
         })
       },
       complete() {
-        wx.hideLoading()
+        // wx.hideLoading()
       }
     })
   },
@@ -435,9 +448,18 @@ Page({
   },
   // 支付方式改变
   payTypeChanged(e) {
-    this.setData({
+    let that = this;
+    that.setData({
       payType: e.detail.value
     })
+    // if(that.data.payTypes[that.data.payType[0]].payment_name == '微信支付') {
+    //   let all_price = that.data.all_price;
+    //   all_price = all_price * (1 + that.data.wxpayservice);
+    //   all_price = all_price.toFixed(2);
+    //   that.setData({
+    //     all_price
+    //   })
+    // }
   },
   // 打开EMT支付弹出层
   openEMTPopup() {
@@ -461,7 +483,39 @@ Page({
     let id = that.data.order_id; //订单ID
     let payment_method = payType.payment_method; //支付方式（0微信支付，1EMT支付，2线下支付）
     let payment_price = that.data.all_price; //支付金额
-    // console.log(payType);
+    // 如果支付方式为微信支付-获取微信支付手续费
+    if (payType.payment_name == '微信支付') {
+      wx.showLoading({
+        title: '加载中',
+        mask: true
+      })
+      wx.request({
+        url: api.Service,
+        header: {
+          'Authorization': wx.getStorageSync('token')
+        },
+        method: 'POST',
+        success(res) {
+          wx.hideLoading();
+          // console.log(res);
+          that.setData({
+            wxpayservice: Number(res.data.data)
+          })
+          payment_price = payment_price * (1 + that.data.wxpayservice);
+          payment_price = payment_price.toFixed(2);
+          that.zhenDePay(id, payment_method, payment_price);
+        },
+        fail(err) {
+          wx.hideLoading()
+        }
+      })
+    }else{
+      that.zhenDePay(id, payment_method, payment_price);
+    }
+  },
+  // 真的要支付吗？在这里？就现在？
+  zhenDePay(id, payment_method, payment_price) {
+    let that = this;
     wx.showLoading({
       title: '加载中',
       mask: true
@@ -478,6 +532,7 @@ Page({
       },
       method: 'POST',
       success(res) {
+        wx.hideLoading()
         console.log(res);
         if (res.data.code === 1) {
           if (res.data.msg == 'EMT支付') {
@@ -551,6 +606,7 @@ Page({
         }
       },
       fail(err) {
+        wx.hideLoading()
         wx.showToast({
           title: '发起网络请求失败',
           icon: 'none',
@@ -558,7 +614,7 @@ Page({
         })
       },
       complete() {
-        wx.hideLoading()
+        // wx.hideLoading()
       }
     })
   },
@@ -637,5 +693,29 @@ Page({
     wx.navigateTo({
       url: '/pages/addaddress/addaddress?type=edit',
     })
-  }
+  },
+  // 获取微信支付手续费
+  getWXPayServiceCharge() {
+    let that = this;
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
+    wx.request({
+      url: api.Service,
+      header: {
+        'Authorization': wx.getStorageSync('token')
+      },
+      method: 'POST',
+      success(res) {
+        wx.hideLoading()
+        that.setData({
+          wxpayservice: res.data.data
+        })
+      },
+      fail(err) {
+        wx.hideLoading()
+      }
+    })
+  },
 })

pages/confirmrefund/confirmrefund.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '退款申请', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //订单id
     billdata: {},
@@ -195,10 +196,10 @@ Page({
   // 上传退款凭证
   uploadVoucher() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -212,6 +213,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',

pages/copypastgroup/copypastgroup.js

@@ -11,6 +11,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '复制往期拼团', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: [
       "全部", "未发布", "已发布", "已截团"

pages/corporatebanktransfer/corporatebanktransfer.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '申请提现', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     arealength: 0,
     imageList: [], //图片列表
@@ -116,10 +117,10 @@ Page({
   // 上传驾照图片
   uploadDrivingLicense() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -134,6 +135,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -187,10 +192,10 @@ Page({
   // 上传空支票
   uploadCompanyCheck() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -205,6 +210,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -252,10 +261,10 @@ Page({
   // 上传营业执照
   uploadBusinessLicense() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -270,6 +279,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',
@@ -317,10 +330,10 @@ Page({
   // 上传个人银行账户空支票
   uploadPersonalCheck() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -335,6 +348,10 @@ Page({
             success: (img) => {
               console.log(img);
               let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+              wx.showLoading({
+                title: '文件上传中',
+                mask: true
+              })
               wx.uploadFile({
                 filePath: img.tempFiles[0].tempFilePath,
                 name: 'file',

pages/countryPhoneCode/countryPhoneCode.js

@@ -10,6 +10,7 @@ Page({
         navbarData: {
             showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
             title: '区号列表', //导航栏 中间的标题
+            capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         },
         countryCodeList: [],
         allCode: [],

pages/deliveryaddress/deliveryaddress.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '提货点管理', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     type: 0, //进入类型（0：提货；1：交货）
     addressList: [], //收货地址列表
@@ -26,7 +27,8 @@ Page({
       that.setData({
         navbarData: {
           showCapsule: 1,
-          title: '提货点管理'
+          title: '提货点管理',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         },
         type: type
       })
@@ -34,7 +36,8 @@ Page({
       that.setData({
         navbarData: {
           showCapsule: 1,
-          title: '收货地址'
+          title: '收货地址',
+          capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
         },
         type: type
       })

pages/exportorder/exportorder.js

@@ -11,6 +11,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '导出订单', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     order_status: [
       '全部',

pages/exportorderdetail/exportorderdetail.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '导出订单', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     /* 组件参数 */
     showPopup: false,

pages/footprint/footprint.js

@@ -11,6 +11,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的足迹', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     pintuan: [],
     time: -1, //防抖时间

pages/goodsbank/goodsbank.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '商品库', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     time: -1, //防抖时间
     goodName: '', //搜索商品名

pages/goodsbank/goodsbank.less

@@ -1,691 +1,701 @@
 /* pages/goodsbank/goodsbank.wxss */
 page {
-  background-color: #F7F7F7;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-
-  .top {
-    height: 74rpx;
-    padding-left: 20rpx;
-    padding-right: 32rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .search-bar {
-      width: 410rpx;
-      height: 100%;
-      background-color: #FFFFFF;
-      border-radius: 42rpx;
-      display: flex;
-      align-items: center;
-
-      input {
-        margin-left: 32rpx;
-        margin-right: 32rpx;
-      }
-    }
-
-    .add-good {
-      width: 190rpx;
-      height: 100%;
-      background-color: #FFFFFF;
-      border-radius: 38rpx;
-      box-sizing: border-box;
-      border: 2rpx solid #FF874E;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      color: #FF874E;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-
-    .manage-txt {
-      color: #656565;
-      font-size: 24rpx;
-      font-weight: 500;
-    }
-
-    .manage-btn {
-      border-radius: 18rpx;
-      width: 84rpx;
-      height: 38rpx;
-      border: 1px solid #FF874E;
-      color: #FF874E;
-      font-size: 24rpx;
-      font-weight: 500;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      box-sizing: border-box;
-    }
-  }
-
-  .body {
-    width: 100%;
-    display: flex;
-    margin-top: 12rpx;
-    flex: 1;
-
-    .lefts {
-
-      &>view {
-        width: 150rpx;
-        background-color: #f7f7f7;
-        color: #989898;
-        font-size: 24rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        padding: 24rpx 0;
-
-        image {
-          border-radius: 50%;
-          width: 48rpx;
-          height: 48rpx;
-          margin-bottom: 8rpx;
-        }
-
-        text {
-          width: 98rpx;
-          text-align: center;
-        }
-      }
-    }
-
-    .rights {
-      width: 650rpx;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      background-color: white;
-      padding-bottom: 42rpx;
-      position: relative;
-
-      .category {
-        width: 614rpx;
-        height: 80rpx;
-        display: flex;
-
-        .scroll-category {
-          width: 500rpx;
-          display: flex;
-          height: 80rpx;
-          align-items: center;
-          white-space: nowrap;
-          position: relative;
-          padding-top: 16rpx;
-          padding-bottom: 16rpx;
-
-          view {
-            padding: 0 20rpx;
-            height: 48rpx;
-            border-radius: 24rpx;
-            display: inline-block;
-            margin-left: 20rpx;
-            font-size: 24rpx;
-            line-height: 48rpx;
-            text-align: center;
-          }
-        }
-
-        .all-category {
-          width: 114rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          color: #656565;
-          font-size: 28rpx;
-          font-weight: 500;
-        }
-      }
-
-      .category-all {
-        width: 614rpx;
-        height: 388rpx;
-        background-color: #FFFFFF;
-        z-index: 99;
-        position: absolute;
-        box-shadow: 0px 7px 27px -8px rgba(0, 0, 0, 0.09);
-        display: flex;
-        flex-direction: column;
-
-        .category-all-top {
-          width: 614rpx;
-          height: 96rpx;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          color: #656565;
-          font-size: 32rpx;
-          font-weight: 600;
-
-          text {
-            margin-left: 20rpx;
-          }
-
-          image {
-            margin-right: 40rpx;
-          }
-        }
-
-        .category-all-body {
-          width: 614rpx;
-          flex: 1;
-
-          view {
-            padding: 0 20rpx;
-            height: 48rpx;
-            border-radius: 24rpx;
-            display: inline-block;
-            margin-left: 20rpx;
-            font-size: 24rpx;
-            line-height: 48rpx;
-            text-align: center;
-            margin-bottom: 20rpx;
-          }
-        }
-      }
-
-      .goods-info {
-        width: 100%;
-        height: 174rpx;
-        display: flex;
-        margin-top: 30rpx;
-
-        .g-left {
-          height: 174rpx;
-          width: 174rpx;
-
-          image {
-            border-radius: 20rpx;
-          }
-        }
-
-        .g-right {
-          display: flex;
-          flex-direction: column;
-          margin-left: 20rpx;
-          justify-content: space-between;
-
-          // 标题
-          .g-title {
-            font-size: 28rpx;
-            color: #464646;
-            font-weight: 600;
-            width: 100%;
-            height: 80rpx;
-
-            image {
-              width: 36rpx;
-              height: 36rpx;
-              display: inline-block;
-              vertical-align: bottom;
-              margin-right: 10rpx;
-            }
-          }
-
-          // 规格
-          .g-guige {
-            font-size: 24rpx;
-
-            &>p:first-child {
-              color: #3F3F3F;
-            }
-
-            &>p:last-child {
-              color: #919191;
-            }
-          }
-
-          // 标签
-          .g-start {
-            min-width: 92rpx;
-            max-width: 152rpx;
-            height: 28rpx;
-            line-height: 28rpx;
-            border: 2rpx solid #FF874E;
-            color: #FF874E;
-            font-size: 20rpx;
-            text-align: center;
-            border-radius: 6rpx;
-          }
-
-          // 价格
-          .g-price {
-            display: flex;
-            flex-direction: row-reverse;
-            align-items: center;
-
-            &>view:first-child {
-              color: #FF874E;
-              margin-left: 20rpx;
-            }
-
-            &>view:last-child {
-              font-size: 24rpx;
-              color: #656565;
-              text-decoration: line-through;
-            }
-          }
-
-          .g-price2 {
-            color: #656565;
-            font-size: 24rpx;
-            font-weight: 400;
-
-            view {
-              float: right;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .foot {
-    width: 100%;
-    bottom: 0;
-    height: 158rpx;
-    background-color: white;
-    position: fixed;
-    box-shadow: 0px -2px 28px -12px #00000030;
-    display: flex;
-    justify-content: center;
-
-    .manage-checkbox {
-      width: 100%;
-      height: 100%;
-      padding-left: 28rpx;
-      padding-right: 20rpx;
-    }
-
-    .manage-checkbox-inner {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-top: 22rpx;
-    }
-
-    .manage-checkbox-inner-left {
-      display: flex;
-      align-items: center;
-
-      image {
-        width: 34rpx;
-        height: 34rpx;
-      }
-
-      text {
-        color: #989898;
-        font-size: 28rpx;
-        font-weight: 500;
-        margin-left: 20rpx;
-      }
-    }
-
-    .manage-checkbox-inner-right {
-      display: flex;
-
-      .button-1 {
-        width: 180rpx;
-        height: 74rpx;
-        border-radius: 37rpx;
-        box-sizing: border-box;
-        border: 2rpx solid #FF874E;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FF874E;
-        font-size: 28rpx;
-        font-weight: 600;
-
-        text {
-          margin-left: 10rpx;
-        }
-      }
-
-      .button-2 {
-        width: 188rpx;
-        height: 74rpx;
-        margin-left: 30rpx;
-        border-radius: 37rpx;
-        box-sizing: border-box;
-        border: 2rpx solid #FF874E;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FF874E;
-        font-size: 28rpx;
-        font-weight: 600;
-      }
-    }
-  }
+	background-color: #F7F7F7;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+
+	.top {
+		height: 74rpx;
+		padding-left: 20rpx;
+		padding-right: 32rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.search-bar {
+			width: 410rpx;
+			height: 100%;
+			background-color: #FFFFFF;
+			border-radius: 42rpx;
+			display: flex;
+			align-items: center;
+
+			input {
+				margin-left: 32rpx;
+				margin-right: 32rpx;
+			}
+		}
+
+		.add-good {
+			width: 190rpx;
+			height: 100%;
+			background-color: #FFFFFF;
+			border-radius: 38rpx;
+			box-sizing: border-box;
+			border: 2rpx solid #FF874E;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #FF874E;
+			font-size: 28rpx;
+			font-weight: 600;
+		}
+
+		.manage-txt {
+			color: #656565;
+			font-size: 24rpx;
+			font-weight: 500;
+		}
+
+		.manage-btn {
+			border-radius: 18rpx;
+			width: 84rpx;
+			height: 38rpx;
+			border: 1px solid #FF874E;
+			color: #FF874E;
+			font-size: 24rpx;
+			font-weight: 500;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+		}
+	}
+
+	.body {
+		width: 100%;
+		display: flex;
+		margin-top: 12rpx;
+		flex: 1;
+
+		.lefts {
+
+			&>view {
+				width: 150rpx;
+				background-color: #f7f7f7;
+				color: #989898;
+				font-size: 24rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				padding: 24rpx 0;
+
+				image {
+					border-radius: 50%;
+					width: 48rpx;
+					height: 48rpx;
+					margin-bottom: 8rpx;
+				}
+
+				text {
+					width: 98rpx;
+					text-align: center;
+				}
+			}
+		}
+
+		.rights {
+			width: 650rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background-color: white;
+			padding-bottom: 42rpx;
+			position: relative;
+
+			.category {
+				width: 614rpx;
+				height: 80rpx;
+				display: flex;
+
+				.scroll-category {
+					width: 500rpx;
+					display: flex;
+					height: 80rpx;
+					align-items: center;
+					white-space: nowrap;
+					position: relative;
+					padding-top: 16rpx;
+					padding-bottom: 16rpx;
+
+					view {
+						padding: 0 20rpx;
+						height: 48rpx;
+						border-radius: 24rpx;
+						display: inline-block;
+						margin-left: 20rpx;
+						font-size: 24rpx;
+						line-height: 48rpx;
+						text-align: center;
+					}
+				}
+
+				.all-category {
+					width: 114rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #656565;
+					font-size: 28rpx;
+					font-weight: 500;
+				}
+			}
+
+			.category-all {
+				width: 614rpx;
+				height: 388rpx;
+				background-color: #FFFFFF;
+				z-index: 99;
+				position: absolute;
+				box-shadow: 0px 7px 27px -8px rgba(0, 0, 0, 0.09);
+				display: flex;
+				flex-direction: column;
+
+				.category-all-top {
+					width: 614rpx;
+					height: 96rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					color: #656565;
+					font-size: 32rpx;
+					font-weight: 600;
+
+					text {
+						margin-left: 20rpx;
+					}
+
+					image {
+						margin-right: 40rpx;
+					}
+				}
+
+				.category-all-body {
+					width: 614rpx;
+					flex: 1;
+
+					view {
+						padding: 0 20rpx;
+						height: 48rpx;
+						border-radius: 24rpx;
+						display: inline-block;
+						margin-left: 20rpx;
+						font-size: 24rpx;
+						line-height: 48rpx;
+						text-align: center;
+						margin-bottom: 20rpx;
+					}
+				}
+			}
+
+			.goods-info {
+				width: 100%;
+				height: 174rpx;
+				display: flex;
+				margin-top: 30rpx;
+
+				.g-left {
+					height: 174rpx;
+					width: 174rpx;
+
+					image {
+						border-radius: 20rpx;
+					}
+				}
+
+				.g-right {
+					display: flex;
+					flex-direction: column;
+					margin-left: 20rpx;
+					justify-content: space-between;
+
+					// 标题
+					.g-title {
+						font-size: 28rpx;
+						color: #464646;
+						font-weight: 600;
+						width: 100%;
+						height: 80rpx;
+
+						image {
+							width: 36rpx;
+							height: 36rpx;
+							display: inline-block;
+							vertical-align: bottom;
+							margin-right: 10rpx;
+						}
+					}
+
+					// 规格
+					.g-guige {
+						font-size: 24rpx;
+
+						&>p:first-child {
+							color: #3F3F3F;
+						}
+
+						&>p:last-child {
+							color: #919191;
+						}
+					}
+
+					// 标签
+					.g-start {
+						min-width: 92rpx;
+						max-width: 152rpx;
+						height: 28rpx;
+						line-height: 28rpx;
+						border: 2rpx solid #FF874E;
+						color: #FF874E;
+						font-size: 20rpx;
+						text-align: center;
+						border-radius: 6rpx;
+					}
+
+					// 价格
+					.g-price {
+						display: flex;
+						flex-direction: row-reverse;
+						align-items: center;
+
+						&>view:first-child {
+							color: #FF874E;
+							margin-left: 20rpx;
+						}
+
+						&>view:last-child {
+							font-size: 24rpx;
+							color: #656565;
+							text-decoration: line-through;
+						}
+					}
+
+					.g-price2 {
+						color: #656565;
+						font-size: 24rpx;
+						font-weight: 400;
+
+						view {
+							float: right;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.foot {
+		width: 100%;
+		bottom: 0;
+		height: 158rpx;
+		background-color: white;
+		position: fixed;
+		box-shadow: 0px -2px 28px -12px #00000030;
+		display: flex;
+		justify-content: center;
+
+		.manage-checkbox {
+			width: 100%;
+			height: 100%;
+			padding-left: 28rpx;
+			padding-right: 20rpx;
+		}
+
+		.manage-checkbox-inner {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 22rpx;
+		}
+
+		.manage-checkbox-inner-left {
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 34rpx;
+				height: 34rpx;
+			}
+
+			text {
+				color: #989898;
+				font-size: 28rpx;
+				font-weight: 500;
+				margin-left: 20rpx;
+			}
+		}
+
+		.manage-checkbox-inner-right {
+			display: flex;
+
+			.button-1 {
+				width: 180rpx;
+				height: 74rpx;
+				border-radius: 37rpx;
+				box-sizing: border-box;
+				border: 2rpx solid #FF874E;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FF874E;
+				font-size: 28rpx;
+				font-weight: 600;
+
+				text {
+					margin-left: 10rpx;
+				}
+			}
+
+			.button-2 {
+				width: 188rpx;
+				height: 74rpx;
+				margin-left: 30rpx;
+				border-radius: 37rpx;
+				box-sizing: border-box;
+				border: 2rpx solid #FF874E;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FF874E;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+		}
+	}
 }
 
 .popup {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
-
-  .popu-title {
-    height: 100rpx;
-    color: #656565;
-    font-size: 32rpx;
-    display: flex;
-    align-items: center;
-  }
-
-  .popu-body {
-    .tag-body {
-      width: 688rpx;
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-
-      .tag-b-info {
-        height: 62rpx;
-        font-size: 32rpx;
-        margin-left: 36rpx;
-        margin-top: 28rpx;
-        display: flex;
-        justify-content: center;
-        background-color: #EFEFEF;
-        border-radius: 50rpx;
-        font-weight: 400;
-        padding: 0 10rpx;
-
-        .tag-b-con {
-          height: 62rpx;
-          overflow: hidden;
-          line-height: 62rpx;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-        }
-      }
-    }
-  }
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	position: relative;
+
+	.popu-title {
+		height: 100rpx;
+		color: #656565;
+		font-size: 32rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.popu-body {
+		.tag-body {
+			width: 688rpx;
+			display: flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+
+			.tag-b-info {
+				height: 62rpx;
+				font-size: 32rpx;
+				margin-left: 36rpx;
+				margin-top: 28rpx;
+				display: flex;
+				justify-content: center;
+				background-color: #EFEFEF;
+				border-radius: 50rpx;
+				font-weight: 400;
+				padding: 0 10rpx;
+
+				.tag-b-con {
+					height: 62rpx;
+					overflow: hidden;
+					line-height: 62rpx;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
 }
 
 // 弹出层
 .popup-good-detail {
-  width: 100%;
-  padding-bottom: 156rpx;
-
-  // 商品详情
-  .popup-swiper {
-    swiper {
-      width: 100%;
-      height: 550rpx;
-
-      image {
-        width: 100%;
-        height: 550rpx;
-      }
-    }
-  }
-
-  .popup-title {
-    color: #494949;
-    font-size: 32rpx;
-    font-weight: bold;
-    margin: 26rpx 20rpx 0 20rpx;
-  }
-
-  .popup-tag {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 12rpx 20rpx 0 20rpx;
-
-    .popup-tag-left {
-      display: flex;
-      align-items: center;
-
-      &>view {
-        width: 92rpx;
-        height: 28rpx;
-        border: 2rpx solid #FF874E;
-        border-radius: 6rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FF874E;
-        font-size: 20rpx;
-        font-weight: 400;
-      }
-
-      &>text {
-        color: #FF4C1A;
-        font-size: 24rpx;
-        font-weight: 400;
-        margin-left: 30rpx;
-      }
-    }
-
-    .popup-tag-right {
-      display: flex;
-      align-items: center;
-      color: #656565;
-      font-size: 24rpx;
-      font-weight: 400;
-    }
-  }
-
-  .popup-guige {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 36rpx 20rpx 0 20rpx;
-
-    .popup-guige-item {
-      height: 56rpx;
-      display: flex;
-      align-items: center;
-      padding: 0 20rpx;
-      font-size: 24rpx;
-      box-sizing: border-box;
-      border: 2rpx solid #FF874E;
-      border-radius: 36rpx;
-      color: #FF874E;
-    }
-
-    .popup-guige-item:not(:first-child) {
-      margin-left: 24rpx;
-    }
-  }
-
-  .goods-item-right-row4 {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 24rpx 20rpx 0rpx 20rpx;
-
-    .price {
-      color: #FF874E;
-      font-weight: 600;
-    }
-
-    .count {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .decrease-img {
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 6rpx;
-      }
-
-      text {
-        margin: 0 24rpx;
-      }
-
-      .increase-img {
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 6rpx;
-      }
-    }
-  }
-
-  .popup-line {
-    height: 8rpx;
-    margin-top: 36rpx;
-    background-color: #F3F3F3;
-  }
-
-  .popup-detail {
-    padding-left: 20rpx;
-    padding-right: 20rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    group-title {
-      width: 100%;
-    }
-
-    .good-intro {
-      width: 672rpx;
-      color: #494949;
-      font-size: 32rpx;
-      margin-top: 20rpx;
-    }
-
-    .good-category {
-      width: 672rpx;
-      margin-top: 20rpx;
-      display: flex;
-      flex-wrap: wrap;
-
-      .good-category-item {
-        height: 42rpx;
-        padding-left: 20rpx;
-        padding-right: 20rpx;
-        background-color: #EFEFEF;
-        border-radius: 22rpx;
-        color: #656565;
-        font-size: 24rpx;
-        display: flex;
-        align-items: center;
-      }
-
-      .good-category-item:not(:first-child) {
-        margin-left: 24rpx;
-      }
-    }
-
-    .good-rule {
-      width: 672rpx;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      margin-bottom: 46rpx;
-
-      .good-rule-item {
-        box-sizing: border-box;
-        width: 324rpx;
-        height: 48rpx;
-        border: 2rpx solid #FF874E;
-        color: #FF874E;
-        font-size: 28rpx;
-        border-radius: 6rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 20rpx;
-      }
-    }
-  }
+	width: 100%;
+	padding-bottom: 156rpx;
+	// padding-top: 50rpx;
+
+	// 商品详情
+	.popup-swiper {
+		border-bottom: 1rpx solid #e4e4e4;
+		.banner-box {
+			height: 550rpx;
+			swiper-item {
+				// display: flex;
+				// justify-content: center;
+				background: #FFF;
+				image {
+					// width: 100%;
+					// height: 550rpx;
+					background: #FFF;
+					width: 100%;
+					height: 550rpx;
+				}
+			}
+		}
+	}
+
+	.popup-title {
+		color: #494949;
+		font-size: 32rpx;
+		font-weight: bold;
+		margin: 26rpx 20rpx 0 20rpx;
+	}
+
+	.popup-tag {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 12rpx 20rpx 0 20rpx;
+
+		.popup-tag-left {
+			display: flex;
+			align-items: center;
+
+			&>view {
+				width: 92rpx;
+				height: 28rpx;
+				border: 2rpx solid #FF874E;
+				border-radius: 6rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FF874E;
+				font-size: 20rpx;
+				font-weight: 400;
+			}
+
+			&>text {
+				color: #FF4C1A;
+				font-size: 24rpx;
+				font-weight: 400;
+				margin-left: 30rpx;
+			}
+		}
+
+		.popup-tag-right {
+			display: flex;
+			align-items: center;
+			color: #656565;
+			font-size: 24rpx;
+			font-weight: 400;
+		}
+	}
+
+	.popup-guige {
+		display: flex;
+		flex-wrap: wrap;
+		margin: 36rpx 20rpx 0 20rpx;
+
+		.popup-guige-item {
+			height: 56rpx;
+			display: flex;
+			align-items: center;
+			padding: 0 20rpx;
+			font-size: 24rpx;
+			box-sizing: border-box;
+			border: 2rpx solid #FF874E;
+			border-radius: 36rpx;
+			color: #FF874E;
+		}
+
+		.popup-guige-item:not(:first-child) {
+			margin-left: 24rpx;
+		}
+	}
+
+	.goods-item-right-row4 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 24rpx 20rpx 0rpx 20rpx;
+
+		.price {
+			color: #FF874E;
+			font-weight: 600;
+		}
+
+		.count {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.decrease-img {
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 6rpx;
+			}
+
+			text {
+				margin: 0 24rpx;
+			}
+
+			.increase-img {
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 6rpx;
+			}
+		}
+	}
+
+	.popup-line {
+		height: 8rpx;
+		margin-top: 36rpx;
+		background-color: #F3F3F3;
+	}
+
+	.popup-detail {
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		group-title {
+			width: 100%;
+		}
+
+		.good-intro {
+			width: 672rpx;
+			color: #494949;
+			font-size: 32rpx;
+			margin-top: 20rpx;
+		}
+
+		.good-category {
+			width: 672rpx;
+			margin-top: 20rpx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.good-category-item {
+				height: 42rpx;
+				padding-left: 20rpx;
+				padding-right: 20rpx;
+				background-color: #EFEFEF;
+				border-radius: 22rpx;
+				color: #656565;
+				font-size: 24rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.good-category-item:not(:first-child) {
+				margin-left: 24rpx;
+			}
+		}
+
+		.good-rule {
+			width: 672rpx;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			margin-bottom: 46rpx;
+
+			.good-rule-item {
+				box-sizing: border-box;
+				width: 324rpx;
+				height: 48rpx;
+				border: 2rpx solid #FF874E;
+				color: #FF874E;
+				font-size: 28rpx;
+				border-radius: 6rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-top: 20rpx;
+			}
+		}
+	}
 }
 
 .foot-ok {
-  position: absolute;
-  bottom: 0;
+	position: absolute;
+	bottom: 0;
 }
 
 .foot-ok>button {
-  width: 688rpx;
-  height: 74rpx;
-  background-color: #FF874E;
-  color: white;
-  border-radius: 37rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 28rpx;
-  font-weight: 600;
+	width: 688rpx;
+	height: 74rpx;
+	background-color: #FF874E;
+	color: white;
+	border-radius: 37rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 28rpx;
+	font-weight: 600;
 }
 
 /* 表格 */
 .table {
-  width: 100%;
-  border: 0px solid darkgray;
-  margin-top: 20rpx;
+	width: 100%;
+	border: 0px solid darkgray;
+	margin-top: 20rpx;
 }
 
 .tr {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  height: 92rpx;
-  align-items: center;
+	display: flex;
+	width: 100%;
+	justify-content: center;
+	height: 92rpx;
+	align-items: center;
 }
 
 .th {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  height: 92rpx;
-  color: #464646;
-  font-size: 24rpx;
-  font-weight: 600;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+	height: 92rpx;
+	color: #464646;
+	font-size: 24rpx;
+	font-weight: 600;
 }
 
 .td {
-  display: flex;
-  justify-content: center;
-  text-align: center;
-  height: 92rpx;
-  line-height: 92rpx;
-  color: #464646;
-  font-size: 24rpx;
-  font-weight: 500;
+	display: flex;
+	justify-content: center;
+	text-align: center;
+	height: 92rpx;
+	line-height: 92rpx;
+	color: #464646;
+	font-size: 24rpx;
+	font-weight: 500;
 }
+
 /* 2列表格宽度 */
 .w-2 {
-  width: 355rpx;
+	width: 355rpx;
 }
+
 /* 4列表格宽度 */
 .w-4 {
-  width: 187.5rpx;
+	width: 187.5rpx;
 }
 
 /* 5列表格宽度 */
 .w-5 {
-  width: 150rpx;
+	width: 150rpx;
 }
 
 /* 6列表格宽度 */
 .w-6 {
-  width: 125rpx;
+	width: 125rpx;
 }
 
 .bb {
-  border-bottom: 2px solid #FF874E;
+	border-bottom: 2px solid #FF874E;
 }
 
 .bg-w {
-  background: white;
+	background: white;
 }
 
 .bg-g {
-  background: rgba(255, 135, 78, 0.14);
+	background: rgba(255, 135, 78, 0.14);
 }

pages/goodsbank/goodsbank.wxml

@@ -160,9 +160,9 @@
 <van-popup show="{{ showGoodDetail }}" round lock-scroll position="bottom" custom-style="height: 65%" bind:close="closeGoodDetail">
   <view class="popup-good-detail">
     <view class="popup-swiper">
-      <swiper indicator-dots circular>
+      <swiper indicator-dots circular class="banner-box">
         <swiper-item wx:for="{{currentGood.commodity_img}}">
-          <image mode="widthFix" src="{{item}}"></image>
+          <image mode="aspectFit" src="{{item}}"></image>
         </swiper-item>
       </swiper>
     </view>

pages/goodsbank/goodsbank.wxss

@@ -356,11 +356,17 @@ page .foot .manage-checkbox-inner-right .button-2 {
   width: 100%;
   padding-bottom: 156rpx;
 }
-.popup-good-detail .popup-swiper swiper {
-  width: 100%;
+.popup-good-detail .popup-swiper {
+  border-bottom: 1rpx solid #e4e4e4;
+}
+.popup-good-detail .popup-swiper .banner-box {
   height: 550rpx;
 }
-.popup-good-detail .popup-swiper swiper image {
+.popup-good-detail .popup-swiper .banner-box swiper-item {
+  background: #FFF;
+}
+.popup-good-detail .popup-swiper .banner-box swiper-item image {
+  background: #FFF;
   width: 100%;
   height: 550rpx;
 }
@@ -548,10 +554,9 @@ page .foot .manage-checkbox-inner-right .button-2 {
   align-items: center;
   text-align: center;
   height: 92rpx;
-  color: #656565;
-  font-size: 28rpx;
-  font-weight: 500;
-  border: 2rpx solid #D4D4D4;
+  color: #464646;
+  font-size: 24rpx;
+  font-weight: 600;
 }
 .td {
   display: flex;
@@ -559,19 +564,14 @@ page .foot .manage-checkbox-inner-right .button-2 {
   text-align: center;
   height: 92rpx;
   line-height: 92rpx;
-  color: #656565;
-  font-size: 28rpx;
+  color: #464646;
+  font-size: 24rpx;
   font-weight: 500;
-  border: 2rpx solid #D4D4D4;
 }
 /* 2列表格宽度 */
 .w-2 {
   width: 355rpx;
 }
-/* 3列表格宽度 */
-.w-3 {
-  width: 237rpx;
-}
 /* 4列表格宽度 */
 .w-4 {
   width: 187.5rpx;
@@ -584,3 +584,12 @@ page .foot .manage-checkbox-inner-right .button-2 {
 .w-6 {
   width: 125rpx;
 }
+.bb {
+  border-bottom: 2px solid #FF874E;
+}
+.bg-w {
+  background: white;
+}
+.bg-g {
+  background: rgba(255, 135, 78, 0.14);
+}

pages/goodsbankchoose/goodsbankchoose.js

@@ -11,6 +11,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '商品库', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     time: -1, //防抖时间
     goodName: '', //搜索商品名

pages/goodsbankselect/goodsbankselect.js

@@ -11,6 +11,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '商品库', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     time: -1, //防抖时间
     goodName: '', //搜索商品名

pages/goodverify/goodverify.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '订单核销', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: [
       "全部", "未收货", "已收货"

pages/groupdetail/groupdetail.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     classify:[
       "生鲜","教育","熟食","生鲜","教育","熟食","甜点糕点","生活用品"

pages/helptosell/helptosell.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '选品大厅', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: ['供应大厅', '关联供应商', '我的申请'],
     tabindex: 0,

pages/index/index.js

@@ -332,9 +332,17 @@ Page({
   // 订单跳转
   navToOrderDetail(e) {
     let id = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: '/pages/orderdetail/orderdetail?id=' + id,
-    })
+    let order_status = e.currentTarget.dataset.status;
+    // console.log(order_status);
+    if(order_status == 4) {
+      wx.navigateTo({
+        url: '/pages/confirmrefund/confirmrefund?id=' + id,
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/orderdetail/orderdetail?id=' + id,
+      })
+    }
   },
   // 打开搜索框
   openSearchPopup() {

pages/index/index.wxml

@@ -67,7 +67,7 @@
     </view>
     <!-- 订单列表 -->
     <view class="test">
-      <order wx:for="{{orders}}" wx:key="index" orderData="{{item}}" data-id="{{item.id}}" bind:share="shareOrder" bindtap="navToOrderDetail"></order>
+      <order wx:for="{{orders}}" wx:key="index" orderData="{{item}}" data-status="{{item.order_status}}" data-id="{{item.id}}" bind:share="shareOrder" bindtap="navToOrderDetail"></order>
     </view>
     <van-empty wx:if="{{orders.length == 0}}" description="暂无数据" />
   </view>

pages/invitehelpmesell/invitehelpmesell.js

@@ -12,6 +12,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '发布帮卖', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     toptabindex: 0, //顶部标签索引
     /* 帮卖商品 */

pages/mine/mine.js

@@ -13,7 +13,7 @@ Page({
     showUserInfo: false, //控制用户头像与昵称显示
     code: '', //小程序授权Code
     avatarUrl: "/images/avatar.png", //这里放了一张灰色头像图片
-    nickName: "请登录", //用户昵称
+    nickName: "请先登录", //用户昵称
     userinfo: {}, //用户信息
   },
   /**
@@ -113,10 +113,15 @@ Page({
   // 用户登录
   login() {
     let that = this;
+    wx.showLoading({
+      title: '正在获取微信信息',
+      mask: true
+    })
     wx.getUserProfile({
       desc: '登录',
       success: (res) => {
         // console.log(res);
+        wx.hideLoading()
         wx.showLoading({
           title: '登录中',
           mask: true
@@ -192,6 +197,7 @@ Page({
         })
       },
       fail: (err) => {
+        wx.hideLoading()
         console.log(err);
       }
     })

pages/mine/mine.wxml

@@ -5,11 +5,11 @@
     <van-image round width="65px" fit="cover" height="65px" src="{{avatarUrl}}" />
     <view class="top-content">
       <view class="top-nick">
-        <view class="nick-name">{{nickName}}</view>
+        <view class="nick-name" style="color: {{isLogin ? '#232323' : '#989898'}};">{{nickName}}</view>
         <view class="nick-login" bindtap="login" wx:if="{{!isLogin}}">登录</view>
       </view>
-      <view class="top-cut">
-        <button bindtap="navgo" data-url="/pages/adminlist/adminlist">切换账号<image src="/images/qiehuan-big.png"></image></button>
+      <view class="top-cut" bindtap="navgo" data-url="/pages/adminlist/adminlist">
+        切换账号<image src="/images/qiehuan-big.png"></image>
       </view>
     </view>
     <view class="top-end">
@@ -121,6 +121,10 @@
         <image src="/images/mine/administrator.png"></image>
         <p>管理员管理</p>
       </view>
+      <!-- <view class="tuan-c-info" bindtap="navgo" data-url="/packageA/pages/lazyLoad/index">
+        <image src="/images/mine/administrator.png"></image>
+        <p>测试</p>
+      </view> -->
     </view>
     <view class="tuan-content1" catchtap="navgo" data-url="/pages/helptosell/helptosell">
       <view class="tuan-c1-info">

pages/mine/mine.wxss

@@ -22,19 +22,43 @@ page{
   flex-direction: column;
   justify-content: space-between;
 }
-.top-cut button{
+/* .top-cut button{
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
   background-color: #FFFFFF;
-  box-shadow: 0px 1px 5px #d1d1d1;
+  box-shadow: 0px 1px 5px -8px rgba(0, 0, 0, 0.18);
   border-radius: 50rpx;
   font-size: 26rpx;
   color: #656565;
   width: 218rpx;
   height: 74rpx;
+  margin: 0;
+} */
+.top-cut{
+  width: 218rpx;
+  height: 74rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  background-color: #FFFFFF;
+  box-shadow: 0px 1px 15px -8px rgba(0, 0, 0, 0.18);
+  border-radius: 38rpx;
+  font-size: 28rpx;
+  color: #656565;
 }
+.top-cut image{
+  width: 34rpx;
+  height: 28rpx;
+  margin-left: 20rpx;
+}
+/* .top-cut button image{
+  width: 34rpx;
+  height: 28rpx;
+  margin-left: 20rpx;
+} */
 .top-nick{
   display: flex;
   justify-content: space-between;
@@ -53,12 +77,8 @@ page{
 }
 .nick-name{
   font-size: 32rpx;
-  color: #989898;
-}
-.top-cut button image{
-  width: 34rpx;
-  height: 28rpx;
-  margin-left: 20rpx;
+  /* color: #989898; */
+  font-weight: 500;
 }
 .top-end{
   width: 250rpx;
@@ -75,7 +95,8 @@ page{
 .top-cutsta{
   width: 182rpx;
   height: 62rpx;
-  background-color: #e9e9e9;
+  background-color: #F3F3F3;
+  font-size: 28rpx;
   color: #656565;
   display: flex;
   align-items: center;
@@ -124,11 +145,12 @@ page{
   height: 50rpx;
 }
 .yuan-content{
-  width: 93%;
+  width: 710rpx;
   height: 158rpx;
-  margin-top: 70rpx;
+  margin-top: 60rpx;
+  border-radius: 20rpx;
   background-color: white;
-  box-shadow: 0px 1px 3px #e6e6e6;
+  box-shadow: 0px 2px 15px -14px rgba(0, 0, 0, 0.5);
   display: flex;
   justify-content: space-around;
   align-items: center;
@@ -155,14 +177,14 @@ page{
   width: 58rpx;
 }
 .yuan-foot{
-  width: 93%;
+  width: 710rpx;
   height: 340rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
   background-color: white;
   margin-top: 50rpx;
-  box-shadow: 0px 1px 3px #e6e6e6;
+  /* box-shadow: 0px 1px 3px #e6e6e6; */
   border-radius: 12rpx;
   align-items: center;
 }
@@ -219,20 +241,21 @@ page{
   display: flex;
   flex-direction: column;
   align-items: center;
+  font-weight: 600;
 }
 .tuan-info image{
   width: 120rpx;
   height: 120rpx;
 }
 .tuan-content{
-  width: 93%;
+  width: 710rpx;
   height: 340rpx;
   background-color: white;
   border-radius: 12rpx;
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  box-shadow: 0px 1px 3px #e6e6e6;
+  /* box-shadow: 0px 1px 3px #e6e6e6; */
 }
 .tuan-c-info{
   width: 25%;
@@ -249,12 +272,13 @@ page{
   height: 64rpx;
 }
 .tuan-content1{
-  width: 93%;
+  width: 708rpx;
   height: 158rpx;
   background-color: white;
-  box-shadow: 0px 1px 3px #e6e6e6;
-  margin-top: 50rpx;
+  box-shadow: 0px 2px 15px -14px rgba(0, 0, 0, 0.5);
+  margin-top: 30rpx;
   display: flex;
+  border-radius: 20rpx;
 }
 .tuan-c1-info{
   width: 50%;
@@ -269,13 +293,14 @@ page{
   margin-left: 30rpx;
 }
 .tuan-foot{
-  width: 93%;
+  width: 710rpx;
   height: 436rpx;
   background-color: white;
-  margin-top: 40rpx;
-  margin-bottom: 50rpx;
+  margin-top: 30rpx;
+  margin-bottom: 30rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
+  border-radius: 12rpx;
 }
 

pages/myapplyfor/myapplyfor.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     classify: [],
     showphone: false,

pages/myapplyfor/myapplyfor.wxml

@@ -55,7 +55,7 @@
         <p>团长介绍</p>
       </view>
       <view class="intro-foot">
-        {{user_info.introduction}}
+        {{user_info.introduction || '未填写，请点击编辑开始设置'}}
       </view>
     </view>
   </view>

pages/myhomepage/myhomepage.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     head_id: 0, //团长id
     height: 0, //状态栏高度
@@ -73,11 +74,25 @@ Page({
    */
   onLoad: function (options) {
     let that = this;
-    this.setData({
+    that.setData({
       height: app.globalData.height,
       enterType: Number(options.type),
       head_id: Number(options.id)
     })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    let that = this;
     // 获取团长详情
     wx.showLoading({
       title: '加载中',
@@ -126,20 +141,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {

pages/myhomepage/myhomepage.wxml

@@ -48,7 +48,7 @@
 				<image src="/images/phone.png"></image>
 			</view>
 			<view class="con-two">
-				<p>号码 {{user_info.phone}}</p>
+				<p>号码 {{user_info.phone || ''}}</p>
 			</view>
 		</view>
 	</view>
@@ -60,7 +60,7 @@
 			<p>团长介绍</p>
 		</view>
 		<view class="intro-foot">
-			{{user_info.introduction}}
+			{{user_info.introduction || '未填写，请点击编辑开始设置'}}
 		</view>
 	</view>
 </view>

pages/myorders/myorders.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '我的订单', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: [
       "全部", "待支付", "待收货", "退款/售后"
@@ -219,9 +220,17 @@ Page({
   // 订单跳转
   navToOrderDetail(e) {
     let id = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: '/pages/orderdetail/orderdetail?id=' + id,
-    })
+    let order_status = e.currentTarget.dataset.status;
+    // console.log(order_status);
+    if(order_status == 4) {
+      wx.navigateTo({
+        url: '/pages/confirmrefund/confirmrefund?id=' + id,
+      })
+    }else {
+      wx.navigateTo({
+        url: '/pages/orderdetail/orderdetail?id=' + id,
+      })
+    }
   },
     // 分享订单
     shareOrder(e) {

pages/myorders/myorders.wxml

@@ -12,5 +12,5 @@
   <image class="sousuo" src="/images/select.png" ></image>
 </view>
 <view class="orders">
-  <order wx:for="{{orders}}" orderData="{{item}}" data-id="{{item.id}}" bind:share="shareOrder" bindtap="navToOrderDetail"></order>
+  <order wx:for="{{orders}}" orderData="{{item}}" data-status="{{item.order_status}}" data-id="{{item.id}}" bind:share="shareOrder" bindtap="navToOrderDetail"></order>
 </view>

pages/orderdetail/orderdetail.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     orderStatus: 0, //订单状态/类型（0：交易完成；1：交易已取消；2：待取货；3：退款成功；4：待支付；）
     /* 组件参数 */
@@ -37,6 +38,8 @@ Page({
     consignee: '', //收货人姓名
     phone: '', //收货人手机号
     receiving_address: '', //收货人地址
+
+    wxpayservice: '', //微信支付手续费
   },
 
   /**
@@ -362,7 +365,39 @@ Page({
     let id = that.data.order_info.id; //订单ID
     let payment_method = payType.payment_method; //支付方式（0微信支付，1EMT支付，2线下支付）
     let payment_price = that.data.order_info.payment_amount; //支付金额
-    console.log(payType);
+    // 如果支付方式为微信支付-获取微信支付手续费
+    if (payType.payment_name == '微信支付') {
+      wx.showLoading({
+        title: '加载中',
+        mask: true
+      })
+      wx.request({
+        url: api.Service,
+        header: {
+          'Authorization': wx.getStorageSync('token')
+        },
+        method: 'POST',
+        success(res) {
+          wx.hideLoading();
+          // console.log(res);
+          that.setData({
+            wxpayservice: Number(res.data.data)
+          })
+          payment_price = payment_price * (1 + that.data.wxpayservice);
+          payment_price = payment_price.toFixed(2);
+          that.zhenDePay(id, payment_method, payment_price);
+        },
+        fail(err) {
+          wx.hideLoading()
+        }
+      })
+    } else {
+      that.zhenDePay(id, payment_method, payment_price);
+    }
+  },
+  // 真的要支付吗？在这里？就现在？
+  zhenDePay(id, payment_method, payment_price) {
+    let that = this;
     wx.showLoading({
       title: '加载中',
       mask: true
@@ -379,6 +414,7 @@ Page({
       },
       method: 'POST',
       success(res) {
+        wx.hideLoading()
         console.log(res);
         if (res.data.code === 1) {
           if (res.data.msg == 'EMT支付') {
@@ -450,6 +486,7 @@ Page({
         }
       },
       fail(err) {
+        wx.hideLoading()
         wx.showToast({
           title: '发起网络请求失败',
           icon: 'none',
@@ -457,7 +494,7 @@ Page({
         })
       },
       complete() {
-        wx.hideLoading()
+        // wx.hideLoading()
       }
     })
   },

pages/orderdetail/orderdetail.wxml

@@ -6,7 +6,8 @@
     <text class="top-info-title">待支付</text>
     <van-image style="margin-left: 238rpx;" src="/images/countdown.png" width="28rpx" height="32rpx"></van-image>
     <!-- <text class="top-info-countdown">剩余时间 {{order_info.remaining_time}}</text> -->
-    <count-down class="top-info-countdown" isTimeStamp="{{true}}" endTime="{{order_info.time * 1000}}"></count-down>
+    <!-- <count-down class="top-info-countdown" isTimeStamp="{{true}}" endTime="{{order_info.time * 1000}}"></count-down> -->
+    <count-down class="top-info-countdow" format="{DD}:{HH}:{mm}:{ss}" endTime="{{order_info.time1 * 1000}}"></count-down>
   </view>
   <view class="top-info" wx:if="{{order_info.order_status === 1}}">
     <text class="top-info-title">待取货</text>

pages/ordermanage/ordermanage.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '订单管理', //导航栏 中间的标题
+      title: '订单管理', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     ordertabs: [
       "全部", "待支付", "待收货", "已完成", "退款/售后"

pages/orderstatus/orderstatus.js

@@ -1,4 +1,3 @@
-// pages/orderdetail/orderdetail.js
 const app = getApp();
 const api = require('../../api/api');
 Page({
@@ -9,7 +8,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '', //导航栏 中间的标题
+      title: '', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     orderStatus: 0, //订单状态/类型（0：交易完成；1：交易已取消；2：待取货；3：退款成功；4：待支付；）
     /* 组件参数 */

pages/orderstatus/orderstatus.wxml

@@ -1,11 +1,10 @@
-<!--pages/orderdetail/orderdetail.wxml-->
 <nav-bar navbar-data="{{navbarData}}"></nav-bar>
 <!-- 订单状态 -->
 <view class="top">
   <view class="top-info" wx:if="{{order_info.order_status === 0}}">
     <text class="top-info-title">待支付</text>
     <van-image style="margin-left: 238rpx;" src="/images/countdown.png" width="28rpx" height="32rpx"></van-image>
-    <text class="top-info-countdown">剩余时间 {{order_info.remaining_time}}</text>
+    <count-down class="top-info-countdow" format="{DD}:{HH}:{mm}:{ss}" endTime="{{order_info.time1 * 1000}}"></count-down>
   </view>
   <view class="top-info" wx:if="{{order_info.order_status === 1}}">
     <text class="top-info-title">待取货</text>

pages/orderstatus/orderstatus.wxss

@@ -1,4 +1,3 @@
-/* pages/orderdetail/orderdetail.wxss */
 page {
   background-color: #f7f7f7;
   padding-bottom: 96rpx;

pages/phonenumber/phonenumber.js

@@ -7,7 +7,8 @@ Page({
     telPhone: '',
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '个人认证', //导航栏 中间的标题
+      title: '个人认证', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
   },
 
@@ -31,68 +32,71 @@ Page({
 
   submitData() {
     let that = this;
-    let phonenumber = Number(that.data.phoneCode + that.data.telPhone);
+    let phonenumber = that.data.phoneCode + '-' + that.data.telPhone;
+    let phone = Number(that.data.phoneCode + that.data.telPhone);
     if (that.data.phoneCode != '' && that.data.telPhone != '') {
 
-      var regExp = new RegExp("^1[3578]\\d{9}$");
-      if (regExp.test(that.data.telPhone)) {
-        wx.showLoading({
-          title: '短信发送中',
-          mask: true
-        })
-        wx.request({
-          url: api.sms,
-          header: {
-            'Authorization': wx.getStorageSync('token')
-          },
-          data: {
-            phone: phonenumber
-          },
-          success(res) {
-            console.log(res);
-            wx.hideLoading()
-            if (res.data.code === 1) {
-              wx.showToast({
-                title: res.data.msg,
-                icon: 'success',
-                mask: true,
-                success() {
-                  setTimeout(() => {
-                    wx.setStorageSync('phonenumber', phonenumber);
-                    wx.navigateTo({
-                      url: '/pages/verifycode/verifycode?phone=' + phonenumber,
-                    })
-                  }, 1500)
-                }
-              })
+      /*       var regExp = new RegExp("^1[3578]\\d{9}$");
+            if (regExp.test(that.data.telPhone)) {
+
             } else {
               wx.showToast({
-                title: res.data.msg,
-                mask: true,
-                icon: 'none',
-                duration: 2000
+                title: '手机号格式错误',
+                icon: 'error',
+                mask: true
               })
-            }
-          },
-          fail(err) {
-            wx.hideLoading()
+            } */
+      wx.showLoading({
+        title: '短信发送中',
+        mask: true
+      })
+      wx.request({
+        url: api.send_sms,
+        header: {
+          'Authorization': wx.getStorageSync('token')
+        },
+        data: {
+          phone: phone
+        },
+        method: 'POST',
+        success(res) {
+          console.log(res);
+          wx.hideLoading()
+          if (res.data.code === 1) {
+            wx.showToast({
+              title: res.data.msg,
+              icon: 'success',
+              mask: true,
+              success() {
+                setTimeout(() => {
+                  wx.setStorageSync('phonenumber', phonenumber);
+                  wx.navigateTo({
+                    url: '/pages/verifycode/verifycode?phone=' + phonenumber,
+                  })
+                }, 1500)
+              }
+            })
+          } else {
             wx.showToast({
-              title: '发起网络请求失败',
+              title: res.data.msg,
+              mask: true,
               icon: 'none',
-              mask: true
+              duration: 2000
             })
-          },
-          complete() {
-            // wx.hideLoading()
           }
-        })
-      } else {
-        wx.showToast({
-          title: '手机号格式错误',
-          icon: 'error',
-          mask: true
-        })
-      }
+        },
+        fail(err) {
+          wx.hideLoading()
+          wx.showToast({
+            title: '发起网络请求失败',
+            icon: 'none',
+            mask: true
+          })
+        },
+        complete() {
+          // wx.hideLoading()
+        }
+      })
     } else {
       wx.showToast({
         title: '手机号码为空！',

pages/pintuanchoose/pintuanchoose.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '拼团选择', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     icon: {
       normal: '../../images/unchecked.png',

pages/pintuandetail/pintuandetail.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     mode: '', //进入模式（manage: 拼团管理, dingyue: 订阅团长）
     height: 0,
@@ -253,11 +254,11 @@ Page({
             orders: res.data.data
           })
         } else {
-          wx.showToast({
-            title: res.data.msg,
-            mask: true,
-            icon: 'none'
-          })
+        //   wx.showToast({
+        //     title: res.data.msg,
+        //     mask: true,
+        //     icon: 'none'
+        //   })
         }
       },
       fail(err) {

pages/pintuandetail/pintuandetail.less

@@ -1,1031 +1,1043 @@
 @import "../../styles/main.less";
 
 .goods-item() {
-  display: flex;
-  align-items: center;
-  margin-bottom: 32rpx;
-
-  .goods-item-left {
-    width: 222rpx;
-    height: 222rpx;
-
-    image {
-      width: 222rpx;
-      height: 222rpx;
-      border-radius: 27rpx;
-    }
-  }
-
-  .goods-item-right {
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-    min-height: 222rpx;
-    margin-left: 34rpx;
-    flex: 1;
-
-    .goods-item-right-row1 {
-      color: #656565;
-      font-size: 29rpx;
-      font-weight: bold;
-    }
-
-    .goods-item-right-row2 {
-      display: flex;
-      justify-content: space-between;
-
-      .goods-item-right-row2-tag {
-        width: 92rpx;
-        height: 28rpx;
-        border: 2rpx solid #FF874E;
-        border-radius: 6rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FF874E;
-        font-size: 20rpx;
-        font-weight: 400;
-      }
-
-      .goods-item-right-row2-txt {
-        color: #656565;
-        font-size: 24rpx;
-        font-weight: 400;
-      }
-    }
-
-    .goods-item-right-row3 {
-      color: #FF4C1A;
-      font-size: 24rpx;
-      font-weight: 400;
-    }
-
-    .goods-item-right-row4 {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .price {
-        color: #FF874E;
-        font-weight: 600;
-      }
-
-      .count {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .decrease-img {
-          width: 40rpx;
-          height: 40rpx;
-          border-radius: 6rpx;
-        }
-
-        text {
-          margin: 0 24rpx;
-        }
-
-        .increase-img {
-          width: 40rpx;
-          height: 40rpx;
-          border-radius: 6rpx;
-        }
-      }
-    }
-  }
+	display: flex;
+	align-items: center;
+	margin-bottom: 32rpx;
+
+	.goods-item-left {
+		width: 222rpx;
+		height: 222rpx;
+
+		image {
+			width: 222rpx;
+			height: 222rpx;
+			border-radius: 27rpx;
+		}
+	}
+
+	.goods-item-right {
+		display: flex;
+		justify-content: space-between;
+		flex-direction: column;
+		min-height: 222rpx;
+		margin-left: 34rpx;
+		flex: 1;
+
+		.goods-item-right-row1 {
+			color: #656565;
+			font-size: 29rpx;
+			font-weight: bold;
+		}
+
+		.goods-item-right-row2 {
+			display: flex;
+			justify-content: space-between;
+
+			.goods-item-right-row2-tag {
+				width: 92rpx;
+				height: 28rpx;
+				border: 2rpx solid #FF874E;
+				border-radius: 6rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FF874E;
+				font-size: 20rpx;
+				font-weight: 400;
+			}
+
+			.goods-item-right-row2-txt {
+				color: #656565;
+				font-size: 24rpx;
+				font-weight: 400;
+			}
+		}
+
+		.goods-item-right-row3 {
+			color: #FF4C1A;
+			font-size: 24rpx;
+			font-weight: 400;
+		}
+
+		.goods-item-right-row4 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.price {
+				color: #FF874E;
+				font-weight: 600;
+			}
+
+			.count {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.decrease-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 6rpx;
+				}
+
+				text {
+					margin: 0 24rpx;
+				}
+
+				.increase-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 6rpx;
+				}
+			}
+		}
+	}
 }
 
 page {
-  background-color: #F7F7F7;
-  padding-bottom: 156rpx;
-
-  // 导航栏
-  .nav-wrap {
-    position: fixed;
-    width: 100%;
-    top: 0;
-    color: #000;
-    z-index: 9999999;
-
-    .nav-title {
-      position: absolute;
-      text-align: center;
-      max-width: 400rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      margin: auto;
-      font-size: 36rpx;
-      color: #2c2b2b;
-      font-weight: 600;
-    }
-
-    .nav-capsule {
-      display: flex;
-      margin-top: 8rpx;
-      align-items: center;
-      margin-left: 30rpx;
-      width: 140rpx;
-      justify-content: space-between;
-      height: 100%;
-
-      .back-pre,
-      .back-home {
-        width: 40rpx;
-        height: 40rpx;
-        margin-top: 1rpx;
-        padding: 10rpx;
-      }
-    }
-  }
-
-  // 背景图
-  .back-img {
-    width: 100%;
-    height: 472rpx;
-  }
-
-  // 团长信息与分享按钮
-  .sell-top {
-    display: flex;
-    justify-content: center;
-
-    .top-body {
-      width: 86%;
-      height: 100rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-left: 40rpx;
-
-      .header-img {
-        margin-top: -80rpx;
-      }
-
-      .body-center {
-        width: 80%;
-        height: 60%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        // margin-bottom: 60rpx;
-        margin-bottom: 20rpx;
-
-        &>view {
-          color: #464646;
-          font-size: 32rpx;
-          font-weight: 600;
-          width: 100%;
-          align-items: center;
-          justify-content: space-between;
-          display: flex;
-          position: relative;
-        }
-
-        &>view>button {
-          width: 86rpx;
-          height: 44rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          color: white;
-          border-radius: 12rpx;
-          font-size: 24rpx;
-          white-space: nowrap;
-          font-weight: 500;
-          position: absolute;
-          left: 160rpx;
-        }
-
-        &>view>view {
-          width: 108rpx;
-          height: 44rpx;
-          box-sizing: border-box;
-          border: 2rpx solid #989898;
-          border-radius: 20rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          color: #656565;
-          font-size: 24rpx;
-          margin-right: 70rpx;
-
-          image {
-            width: 6rpx;
-            height: 20rpx;
-            margin-left: 10rpx;
-          }
-        }
-      }
-    }
-
-    .share-btn {
-      height: 74rpx;
-      background-color: #FF874E;
-      border-radius: 20rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      color: #FFFFFF;
-      font-size: 28rpx;
-      margin-right: 20rpx;
-    }
-  }
-
-  // 拼团卡片
-  .pintuan-card {
-    width: 710rpx;
-    background-color: #FFFFFF;
-    margin: 0 auto;
-    border-radius: 20rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .pintuan-name {
-      width: 652rpx;
-      color: @darkFontColor;
-      font-weight: 600;
-      margin-top: 28rpx;
-    }
-
-    .pintuan-status {
-      width: 652rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-top: 22rpx;
-
-      image {
-        width: 32rpx;
-        height: 32rpx;
-      }
-
-      .pintuan-status-left {
-        display: flex;
-        align-items: center;
-        color: @mainColor;
-        font-size: 28rpx;
-        font-weight: 400;
-
-        .eye-count {
-          display: flex;
-          align-items: center;
-        }
-
-        .order-count {
-          display: flex;
-          align-items: center;
-          margin-left: 62rpx;
-        }
-      }
-
-      .pintuan-status-right {
-        color: #08DFA1;
-        font-size: 28rpx;
-        font-weight: 400;
-      }
-    }
-
-    .pintuan-progress {
-      width: 652rpx;
-      margin-top: 34rpx;
-
-      .current-progress {
-        width: 100%;
-      }
-
-      .countdown-time {
-        width: 100%;
-        font-size: 22rpx;
-        color: #F35E5E;
-        display: flex;
-        flex-direction: row-reverse;
-        margin-top: 14rpx;
-      }
-    }
-
-    .pintuan-intro {
-      width: 652rpx;
-      font-size: 29rpx;
-      color: #656565;
-      margin-top: 24rpx;
-    }
-
-    .pintuan-video {
-      width: 652rpx;
-      height: 432rpx;
-      margin-top: 38rpx;
-    }
-
-    .pintuan-datu {
-      width: 652rpx;
-      height: 432rpx;
-      margin-top: 30rpx;
-    }
-
-    .pintuan-xiaotu-container {
-      width: 652rpx;
-      display: flex;
-      flex-wrap: wrap;
-      margin-top: 30rpx;
-
-      .pintuan-xiaotu-item {
-        background-color: #989898;
-        border-radius: 20rpx;
-        position: relative;
-      }
-
-      .column3 {
-        height: 198rpx;
-        width: calc((100% - 4 * 16rpx) / 3);
-        margin-bottom: 30rpx;
-      }
-
-      .column3:not(:nth-child(3n+1)) {
-        margin-left: 32rpx;
-      }
-    }
-  }
-
-  // 操作按钮
-  .operate-btn {
-    width: 710rpx;
-    height: 100rpx;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-
-    .btn {
-      border: 2rpx solid #C3C3C3;
-      border-radius: 27rpx;
-      height: 54rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      color: #989898;
-      font-size: 24rpx;
-      font-weight: 500;
-      padding: 0 30rpx;
-      margin-left: 20rpx;
-    }
-  }
-
-  // 商品卡片
-  .goods-card {
-    background-color: #FFFFFF;
-    padding: 0 20rpx;
-    padding-top: 24rpx;
-
-    .goods-card-top {
-      display: flex;
-      height: 60rpx;
-      align-items: center;
-      justify-content: space-between;
-
-      .category-scroll {
-        display: flex;
-        align-items: center;
-        width: 560rpx;
-        height: 60rpx;
-        white-space: nowrap;
-
-        .category-item {
-          line-height: 60rpx;
-          display: inline-block;
-          font-size: 28rpx;
-          color: #656565;
-
-          &:not(:first-child) {
-            margin-left: 40rpx;
-          }
-        }
-      }
-
-      .right-menu {
-        height: 60rpx;
-        display: flex;
-        align-items: center;
-        font-size: 24rpx;
-        color: #656565;
-
-        &>image {
-          height: 32rpx;
-          width: 32rpx;
-          margin-right: 20rpx;
-          margin-left: 10rpx;
-        }
-      }
-    }
-
-    // 卡片模式
-    .goods-card-body {
-      margin-top: 34rpx;
-      display: flex;
-      flex-wrap: wrap;
-
-      .good-card {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        position: relative;
-
-        .cover-view {
-          width: 344rpx;
-          height: 78rpx;
-          background: rgba(0, 0, 0, 0.41);
-          border-radius: 0px 0px 10px 10px;
-          top: 266rpx;
-          position: absolute;
-          text-align: center;
-          line-height: 78rpx;
-          color: #FFFFFF;
-          font-size: 28rpx;
-        }
-
-        image {
-          width: 100%;
-          height: 344rpx;
-          border-radius: 27rpx;
-        }
-
-        .good-title {
-          width: 318rpx;
-          color: #656565;
-          font-size: 29rpx;
-          font-weight: bold;
-          margin-top: 20rpx;
-        }
-
-        .tag-sold {
-          width: 318rpx;
-          display: flex;
-          justify-content: space-between;
-          margin-top: 6rpx;
-
-          .tag {
-            width: 92rpx;
-            height: 28rpx;
-            border: 2rpx solid #FF874E;
-            border-radius: 6rpx;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            color: #FF874E;
-            font-size: 20rpx;
-            font-weight: 400;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-          }
-
-          .sold {
-            color: #656565;
-            font-size: 24rpx;
-            font-weight: 400;
-          }
-        }
-
-        .price-count {
-          width: 318rpx;
-          display: flex;
-          flex-direction: column;
-          margin-top: 22rpx;
-
-          .underline-price {
-            color: #656565;
-            font-size: 24rpx;
-            text-decoration: line-through;
-          }
-
-          .normal-price {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-
-            .price {
-              color: #FF874E;
-              font-weight: 600;
-            }
-
-            .count {
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-
-              .decrease-img {
-                width: 40rpx;
-                height: 40rpx;
-                border-radius: 6rpx;
-              }
-
-              text {
-                margin: 0 24rpx;
-              }
-
-              .increase-img {
-                width: 40rpx;
-                height: 40rpx;
-                border-radius: 6rpx;
-              }
-            }
-          }
-        }
-      }
-
-      .column2 {
-        width: calc((100% - 2 * 12rpx) / 2);
-        margin-bottom: 22rpx;
-      }
-
-      .column2:not(:nth-child(2n+1)) {
-        margin-left: 22rpx;
-      }
-    }
-
-    .goods-list-body {
-      padding: 42rpx 0;
-
-      .goods-item {
-        .goods-item()
-      }
-    }
-  }
-
-  // 订单列表和评价卡片
-  .order-comment {
-    background-color: #FFFFFF;
-    padding: 0 20rpx;
-    padding-top: 26rpx;
-    padding-left: 32rpx;
-    padding-right: 46rpx;
-    margin-top: 24rpx;
-
-    .tab {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .tab-left {
-        display: flex;
-        align-items: center;
-
-        &>text:not(:first-child) {
-          margin-left: 60rpx;
-        }
-      }
-
-      .tab-right {
-        width: 156rpx;
-        height: 56rpx;
-        box-sizing: border-box;
-        border: 2rpx solid #FF874E;
-        border-radius: 36rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: #FF874E;
-        font-size: 24rpx;
-        font-weight: 500;
-      }
-    }
-
-    .order-list {
-      min-height: 200rpx;
-
-      .order {
-        border-bottom: 2rpx solid #F5F5F5;
-        display: flex;
-
-        .order-no {
-          margin-top: 42rpx;
-        }
-
-        .order-content {
-          width: 100%;
-          margin-left: 38rpx;
-          padding-bottom: 28rpx;
-
-          .order-content-top {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            width: 100%;
-            margin-top: 42rpx;
-
-            .top-left {
-              display: flex;
-              align-items: center;
-              color: #464646;
-              font-size: 32rpx;
-
-              &>image {
-                width: 48rpx;
-                height: 48rpx;
-                border-radius: 50%;
-              }
-            }
-
-            .top-right {
-              display: flex;
-              align-items: center;
-              color: #656565;
-              font-size: 24rpx;
-            }
-          }
-
-          .order-content-row {
-            display: flex;
-            justify-content: space-between;
-            color: #656565;
-            font-size: 29rpx;
-            font-weight: 400;
-            margin-top: 20rpx;
-          }
-        }
-      }
-    }
-
-    .comment-list {
-      min-height: 200rpx;
-
-      .comment {
-        border-bottom: 2rpx solid #F5F5F5;
-        padding-bottom: 30rpx;
-
-        .comment-top {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          width: 100%;
-          margin-top: 42rpx;
-
-          .top-left {
-            display: flex;
-            align-items: center;
-            color: #464646;
-            font-size: 32rpx;
-
-            &>image {
-              width: 48rpx;
-              height: 48rpx;
-              border-radius: 50%;
-            }
-          }
-
-          .top-right {
-            display: flex;
-            align-items: center;
-            color: #656565;
-            font-size: 24rpx;
-          }
-        }
-
-        .comment-row {
-          display: flex;
-          justify-content: space-between;
-          color: #656565;
-          font-size: 29rpx;
-          font-weight: 400;
-          margin-top: 20rpx;
-        }
-      }
-    }
-  }
-
-  // 底部栏
-  .foot {
-    width: 100%;
-    height: 156rpx;
-    background-color: #FFFFFF;
-    position: fixed;
-    bottom: 0;
-    box-shadow: 0px -2px 28px -12px rgba(0, 0, 0, 0.19);
-    z-index: 999;
-
-    .foot-row {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-top: 24rpx;
-
-      .foot-row-left {
-        display: flex;
-        align-items: center;
-
-        .foot-row-left-image {
-          width: 48rpx;
-          height: 54rpx;
-          margin-left: 30rpx;
-        }
-
-        .foot-row-left-text1 {
-          color: #FF874E;
-          font-size: 28rpx;
-        }
-
-        .foot-row-left-text2 {
-          color: #FF874E;
-          font-size: 42rpx;
-          margin-left: 8rpx;
-        }
-
-        .foot-row-left-text3 {
-          color: #656565;
-          font-size: 24rpx;
-          text-decoration: line-through;
-          margin-left: 20rpx;
-        }
-      }
-
-      .foot-row-right {
-        display: flex;
-        align-items: center;
-
-        .foot-row-right-btn1 {
-          width: 166rpx;
-          height: 74rpx;
-          box-sizing: border-box;
-          border: 2rpx solid #FF874E;
-          color: #FF874E;
-          font-size: 28rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 37rpx;
-        }
-
-        .foot-row-right-btn2 {
-          width: 166rpx;
-          height: 74rpx;
-          box-sizing: border-box;
-          border: 2rpx solid #FF874E;
-          background-color: #FF874E;
-          color: #FFFFFF;
-          font-size: 28rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 37rpx;
-          margin-left: 20rpx;
-          margin-right: 20rpx;
-        }
-      }
-    }
-  }
-
-  // 弹出层
-  .popup {
-    width: 100%;
-    padding-bottom: 156rpx;
-
-    // 购物车
-    .popup-top {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-top: 40rpx;
-      margin-bottom: 46rpx;
-      margin-left: 32rpx;
-      margin-right: 34rpx;
-
-      .popup-top-left {
-        display: flex;
-        align-items: center;
-
-        &>text:first-child {
-          color: #656565;
-          font-size: 36rpx;
-          font-weight: 600;
-        }
-
-        &>text:last-child {
-          color: #656565;
-          font-size: 24rpx;
-          font-weight: 400;
-          margin-left: 20rpx;
-        }
-      }
-
-      .popup-top-right {
-        display: flex;
-        align-items: center;
-
-        &>text {
-          color: #656565;
-          font-size: 24rpx;
-        }
-      }
-    }
-
-    .goods-item {
-      margin-left: 22rpx;
-      margin-right: 18rpx;
-      .goods-item()
-    }
-
-    // 商品详情
-    .popup-swiper {
-      swiper {
-        width: 100%;
-        height: 550rpx;
-
-        image {
-          width: 100%;
-        }
-      }
-    }
-
-    .popup-title {
-      color: #494949;
-      font-size: 32rpx;
-      font-weight: bold;
-      margin: 26rpx 20rpx 0 20rpx;
-    }
-
-    .popup-tag {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 12rpx 20rpx 0 20rpx;
-
-      .popup-tag-left {
-        display: flex;
-        align-items: center;
-
-        &>view {
-          width: 92rpx;
-          height: 28rpx;
-          border: 2rpx solid #FF874E;
-          border-radius: 6rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          color: #FF874E;
-          font-size: 20rpx;
-          font-weight: 400;
-        }
-
-        &>text {
-          color: #FF4C1A;
-          font-size: 24rpx;
-          font-weight: 400;
-          margin-left: 30rpx;
-        }
-      }
-
-      .popup-tag-right {
-        display: flex;
-        align-items: center;
-        color: #656565;
-        font-size: 24rpx;
-        font-weight: 400;
-      }
-    }
-
-    .popup-guige {
-      display: flex;
-      flex-wrap: wrap;
-      margin: 36rpx 20rpx 0 20rpx;
-
-      .popup-guige-item {
-        height: 56rpx;
-        display: flex;
-        align-items: center;
-        padding: 0 20rpx;
-        font-size: 24rpx;
-        box-sizing: border-box;
-        border: 2rpx solid #FF874E;
-        border-radius: 36rpx;
-      }
-
-      .popup-guige-item:not(:first-child) {
-        margin-left: 24rpx;
-      }
-    }
-
-    .goods-item-right-row4 {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 24rpx 20rpx 0rpx 20rpx;
-
-      .price {
-        color: #FF874E;
-        font-weight: 600;
-      }
-
-      .count {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .decrease-img {
-          width: 40rpx;
-          height: 40rpx;
-          border-radius: 6rpx;
-        }
-
-        text {
-          margin: 0 24rpx;
-        }
-
-        .increase-img {
-          width: 40rpx;
-          height: 40rpx;
-          border-radius: 6rpx;
-        }
-      }
-    }
-
-    .popup-line {
-      height: 8rpx;
-      margin-top: 36rpx;
-      background-color: #F3F3F3;
-    }
-
-    .popup-detail {
-      padding-left: 20rpx;
-      padding-right: 20rpx;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-      group-title {
-        width: 100%;
-      }
-
-      .good-intro {
-        width: 672rpx;
-        color: #494949;
-        font-size: 32rpx;
-        margin-top: 20rpx;
-      }
-
-      .good-category {
-        width: 672rpx;
-        margin-top: 20rpx;
-        display: flex;
-        flex-wrap: wrap;
-
-        .good-category-item {
-          height: 42rpx;
-          padding-left: 20rpx;
-          padding-right: 20rpx;
-          background-color: #EFEFEF;
-          border-radius: 22rpx;
-          color: #656565;
-          font-size: 24rpx;
-          display: flex;
-          align-items: center;
-        }
-
-        .good-category-item:not(:first-child) {
-          margin-left: 24rpx;
-        }
-      }
-
-      .good-rule {
-        width: 672rpx;
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        margin-bottom: 46rpx;
-
-        .good-rule-item {
-          box-sizing: border-box;
-          width: 324rpx;
-          height: 48rpx;
-          border: 2rpx solid #FF874E;
-          color: #FF874E;
-          font-size: 28rpx;
-          border-radius: 6rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          margin-top: 20rpx;
-        }
-      }
-    }
-  }
+	background-color: #F7F7F7;
+	padding-bottom: 156rpx;
+
+	// 导航栏
+	.nav-wrap {
+		position: fixed;
+		width: 100%;
+		top: 0;
+		color: #000;
+		z-index: 9999999;
+
+		.nav-title {
+			position: absolute;
+			text-align: center;
+			max-width: 400rpx;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			font-size: 36rpx;
+			color: #2c2b2b;
+			font-weight: 600;
+		}
+
+		.nav-capsule {
+			display: flex;
+			margin-top: 8rpx;
+			align-items: center;
+			margin-left: 30rpx;
+			width: 140rpx;
+			justify-content: space-between;
+			height: 100%;
+
+			.back-pre,
+			.back-home {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 1rpx;
+				padding: 10rpx;
+			}
+		}
+	}
+
+	// 背景图
+	.back-img {
+		width: 100%;
+		height: 472rpx;
+	}
+
+	// 团长信息与分享按钮
+	.sell-top {
+		display: flex;
+		justify-content: center;
+
+		.top-body {
+			width: 86%;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-left: 40rpx;
+
+			.header-img {
+				margin-top: -80rpx;
+			}
+
+			.body-center {
+				width: 80%;
+				height: 60%;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				// margin-bottom: 60rpx;
+				margin-bottom: 20rpx;
+
+				&>view {
+					color: #464646;
+					font-size: 32rpx;
+					font-weight: 600;
+					width: 100%;
+					align-items: center;
+					justify-content: space-between;
+					display: flex;
+					position: relative;
+				}
+
+				&>view>button {
+					width: 86rpx;
+					height: 44rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: white;
+					border-radius: 12rpx;
+					font-size: 24rpx;
+					white-space: nowrap;
+					font-weight: 500;
+					position: absolute;
+					left: 160rpx;
+				}
+
+				&>view>view {
+					width: 108rpx;
+					height: 44rpx;
+					box-sizing: border-box;
+					border: 2rpx solid #989898;
+					border-radius: 20rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #656565;
+					font-size: 24rpx;
+					margin-right: 70rpx;
+
+					image {
+						width: 6rpx;
+						height: 20rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+
+		.share-btn {
+			height: 74rpx;
+			background-color: #FF874E;
+			border-radius: 20rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #FFFFFF;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+		}
+	}
+
+	// 拼团卡片
+	.pintuan-card {
+		width: 710rpx;
+		background-color: #FFFFFF;
+		margin: 0 auto;
+		border-radius: 20rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-bottom: 20rpx;
+
+		.pintuan-name {
+			width: 652rpx;
+			color: @darkFontColor;
+			font-weight: 600;
+			margin-top: 28rpx;
+		}
+
+		.pintuan-status {
+			width: 652rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-top: 22rpx;
+
+			image {
+				width: 32rpx;
+				height: 32rpx;
+			}
+
+			.pintuan-status-left {
+				display: flex;
+				align-items: center;
+				color: @mainColor;
+				font-size: 28rpx;
+				font-weight: 400;
+
+				.eye-count {
+					display: flex;
+					align-items: center;
+				}
+
+				.order-count {
+					display: flex;
+					align-items: center;
+					margin-left: 62rpx;
+				}
+			}
+
+			.pintuan-status-right {
+				color: #08DFA1;
+				font-size: 28rpx;
+				font-weight: 400;
+			}
+		}
+
+		.pintuan-progress {
+			width: 652rpx;
+			margin-top: 34rpx;
+
+			.current-progress {
+				width: 100%;
+			}
+
+			.countdown-time {
+				width: 100%;
+				font-size: 22rpx;
+				color: #F35E5E;
+				display: flex;
+				flex-direction: row-reverse;
+				margin-top: 14rpx;
+			}
+		}
+
+		.pintuan-intro {
+			width: 652rpx;
+			font-size: 29rpx;
+			color: #656565;
+			margin-top: 24rpx;
+		}
+
+		.pintuan-video {
+			width: 652rpx;
+			height: 432rpx;
+			margin-top: 38rpx;
+		}
+
+		.pintuan-datu {
+			width: 652rpx;
+			height: 432rpx;
+			margin-top: 30rpx;
+		}
+
+		.pintuan-xiaotu-container {
+			width: 652rpx;
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 30rpx;
+
+			.pintuan-xiaotu-item {
+				background-color: #989898;
+				border-radius: 20rpx;
+				position: relative;
+			}
+
+			.column3 {
+				height: 198rpx;
+				width: calc((100% - 4 * 16rpx) / 3);
+				margin-bottom: 30rpx;
+			}
+
+			.column3:not(:nth-child(3n+1)) {
+				margin-left: 32rpx;
+			}
+		}
+	}
+
+	// 操作按钮
+	.operate-btn {
+		width: 710rpx;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+
+		.btn {
+			border: 2rpx solid #C3C3C3;
+			border-radius: 27rpx;
+			height: 54rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #989898;
+			font-size: 24rpx;
+			font-weight: 500;
+			padding: 0 30rpx;
+			margin-left: 20rpx;
+		}
+	}
+
+	// 商品卡片
+	.goods-card {
+		background-color: #FFFFFF;
+		padding: 0 20rpx;
+		padding-top: 24rpx;
+
+		.goods-card-top {
+			display: flex;
+			height: 60rpx;
+			align-items: center;
+			justify-content: space-between;
+
+			.category-scroll {
+				display: flex;
+				align-items: center;
+				width: 560rpx;
+				height: 60rpx;
+				white-space: nowrap;
+
+				.category-item {
+					line-height: 60rpx;
+					display: inline-block;
+					font-size: 28rpx;
+					color: #656565;
+
+					&:not(:first-child) {
+						margin-left: 40rpx;
+					}
+				}
+			}
+
+			.right-menu {
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				color: #656565;
+
+				&>image {
+					height: 32rpx;
+					width: 32rpx;
+					margin-right: 20rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		// 卡片模式
+		.goods-card-body {
+			margin-top: 34rpx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.good-card {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				position: relative;
+
+				.cover-view {
+					width: 344rpx;
+					height: 78rpx;
+					background: rgba(0, 0, 0, 0.41);
+					border-radius: 0px 0px 10px 10px;
+					top: 266rpx;
+					position: absolute;
+					text-align: center;
+					line-height: 78rpx;
+					color: #FFFFFF;
+					font-size: 28rpx;
+				}
+
+				image {
+					width: 100%;
+					height: 344rpx;
+					border-radius: 27rpx;
+				}
+
+				.good-title {
+					width: 318rpx;
+					color: #656565;
+					font-size: 29rpx;
+					font-weight: bold;
+					margin-top: 20rpx;
+				}
+
+				.tag-sold {
+					width: 318rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 6rpx;
+
+					.tag {
+						width: 92rpx;
+						height: 28rpx;
+						border: 2rpx solid #FF874E;
+						border-radius: 6rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						color: #FF874E;
+						font-size: 20rpx;
+						font-weight: 400;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+
+					.sold {
+						color: #656565;
+						font-size: 24rpx;
+						font-weight: 400;
+					}
+				}
+
+				.price-count {
+					width: 318rpx;
+					display: flex;
+					flex-direction: column;
+					margin-top: 22rpx;
+
+					.underline-price {
+						color: #656565;
+						font-size: 24rpx;
+						text-decoration: line-through;
+					}
+
+					.normal-price {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.price {
+							color: #FF874E;
+							font-weight: 600;
+						}
+
+						.count {
+							display: flex;
+							justify-content: space-between;
+							align-items: center;
+
+							.decrease-img {
+								width: 40rpx;
+								height: 40rpx;
+								border-radius: 6rpx;
+							}
+
+							text {
+								margin: 0 24rpx;
+							}
+
+							.increase-img {
+								width: 40rpx;
+								height: 40rpx;
+								border-radius: 6rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.column2 {
+				width: calc((100% - 2 * 12rpx) / 2);
+				margin-bottom: 22rpx;
+			}
+
+			.column2:not(:nth-child(2n+1)) {
+				margin-left: 22rpx;
+			}
+		}
+
+		.goods-list-body {
+			padding: 42rpx 0;
+
+			.goods-item {
+				.goods-item()
+			}
+		}
+	}
+
+	// 订单列表和评价卡片
+	.order-comment {
+		background-color: #FFFFFF;
+		padding: 0 20rpx;
+		padding-top: 26rpx;
+		padding-left: 32rpx;
+		padding-right: 46rpx;
+		margin-top: 24rpx;
+
+		.tab {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.tab-left {
+				display: flex;
+				align-items: center;
+
+				&>text:not(:first-child) {
+					margin-left: 60rpx;
+				}
+			}
+
+			.tab-right {
+				width: 156rpx;
+				height: 56rpx;
+				box-sizing: border-box;
+				border: 2rpx solid #FF874E;
+				border-radius: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #FF874E;
+				font-size: 24rpx;
+				font-weight: 500;
+			}
+		}
+
+		.order-list {
+			min-height: 200rpx;
+
+			.order {
+				border-bottom: 2rpx solid #F5F5F5;
+				display: flex;
+
+				.order-no {
+					margin-top: 42rpx;
+				}
+
+				.order-content {
+					width: 100%;
+					margin-left: 38rpx;
+					padding-bottom: 28rpx;
+
+					.order-content-top {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						width: 100%;
+						margin-top: 42rpx;
+
+						.top-left {
+							display: flex;
+							align-items: center;
+							color: #464646;
+							font-size: 32rpx;
+
+							&>image {
+								width: 48rpx;
+								height: 48rpx;
+								border-radius: 50%;
+							}
+						}
+
+						.top-right {
+							display: flex;
+							align-items: center;
+							color: #656565;
+							font-size: 24rpx;
+						}
+					}
+
+					.order-content-row {
+						display: flex;
+						justify-content: space-between;
+						color: #656565;
+						font-size: 29rpx;
+						font-weight: 400;
+						margin-top: 20rpx;
+					}
+				}
+			}
+		}
+
+		.comment-list {
+			min-height: 200rpx;
+
+			.comment {
+				border-bottom: 2rpx solid #F5F5F5;
+				padding-bottom: 30rpx;
+
+				.comment-top {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					width: 100%;
+					margin-top: 42rpx;
+
+					.top-left {
+						display: flex;
+						align-items: center;
+						color: #464646;
+						font-size: 32rpx;
+
+						&>image {
+							width: 48rpx;
+							height: 48rpx;
+							border-radius: 50%;
+						}
+					}
+
+					.top-right {
+						display: flex;
+						align-items: center;
+						color: #656565;
+						font-size: 24rpx;
+					}
+				}
+
+				.comment-row {
+					display: flex;
+					justify-content: space-between;
+					color: #656565;
+					font-size: 29rpx;
+					font-weight: 400;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
+
+	// 底部栏
+	.foot {
+		width: 100%;
+		height: 156rpx;
+		background-color: #FFFFFF;
+		position: fixed;
+		bottom: 0;
+		box-shadow: 0px -2px 28px -12px rgba(0, 0, 0, 0.19);
+		z-index: 999;
+
+		.foot-row {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-top: 24rpx;
+
+			.foot-row-left {
+				display: flex;
+				align-items: center;
+
+				.foot-row-left-image {
+					width: 48rpx;
+					height: 54rpx;
+					margin-left: 30rpx;
+				}
+
+				.foot-row-left-text1 {
+					color: #FF874E;
+					font-size: 28rpx;
+				}
+
+				.foot-row-left-text2 {
+					color: #FF874E;
+					font-size: 42rpx;
+					margin-left: 8rpx;
+				}
+
+				.foot-row-left-text3 {
+					color: #656565;
+					font-size: 24rpx;
+					text-decoration: line-through;
+					margin-left: 20rpx;
+				}
+			}
+
+			.foot-row-right {
+				display: flex;
+				align-items: center;
+
+				.foot-row-right-btn1 {
+					width: 166rpx;
+					height: 74rpx;
+					box-sizing: border-box;
+					border: 2rpx solid #FF874E;
+					color: #FF874E;
+					font-size: 28rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 37rpx;
+				}
+
+				.foot-row-right-btn2 {
+					width: 166rpx;
+					height: 74rpx;
+					box-sizing: border-box;
+					border: 2rpx solid #FF874E;
+					background-color: #FF874E;
+					color: #FFFFFF;
+					font-size: 28rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 37rpx;
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+				}
+			}
+		}
+	}
+
+	// 弹出层
+	.popup {
+		width: 100%;
+		padding-bottom: 156rpx;
+
+		// 购物车
+		.popup-top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 40rpx;
+			margin-bottom: 46rpx;
+			margin-left: 32rpx;
+			margin-right: 34rpx;
+
+			.popup-top-left {
+				display: flex;
+				align-items: center;
+
+				&>text:first-child {
+					color: #656565;
+					font-size: 36rpx;
+					font-weight: 600;
+				}
+
+				&>text:last-child {
+					color: #656565;
+					font-size: 24rpx;
+					font-weight: 400;
+					margin-left: 20rpx;
+				}
+			}
+
+			.popup-top-right {
+				display: flex;
+				align-items: center;
+
+				&>text {
+					color: #656565;
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.goods-item {
+			margin-left: 22rpx;
+			margin-right: 18rpx;
+			.goods-item()
+		}
+
+		// 商品详情
+		.popup-swiper {
+			border-bottom: 1rpx solid #e4e4e4;
+
+			.banner-box {
+				height: 550rpx;
+
+				swiper-item {
+					// display: flex;
+					// justify-content: center;
+					background: #FFF;
+
+					image {
+						// width: 100%;
+						// height: 550rpx;
+						background: #FFF;
+						width: 100%;
+						height: 550rpx;
+					}
+				}
+			}
+		}
+
+		.popup-title {
+			color: #494949;
+			font-size: 32rpx;
+			font-weight: bold;
+			margin: 26rpx 20rpx 0 20rpx;
+		}
+
+		.popup-tag {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 12rpx 20rpx 0 20rpx;
+
+			.popup-tag-left {
+				display: flex;
+				align-items: center;
+
+				&>view {
+					width: 92rpx;
+					height: 28rpx;
+					border: 2rpx solid #FF874E;
+					border-radius: 6rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #FF874E;
+					font-size: 20rpx;
+					font-weight: 400;
+				}
+
+				&>text {
+					color: #FF4C1A;
+					font-size: 24rpx;
+					font-weight: 400;
+					margin-left: 30rpx;
+				}
+			}
+
+			.popup-tag-right {
+				display: flex;
+				align-items: center;
+				color: #656565;
+				font-size: 24rpx;
+				font-weight: 400;
+			}
+		}
+
+		.popup-guige {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 36rpx 20rpx 0 20rpx;
+
+			.popup-guige-item {
+				height: 56rpx;
+				display: flex;
+				align-items: center;
+				padding: 0 20rpx;
+				font-size: 24rpx;
+				box-sizing: border-box;
+				border: 2rpx solid #FF874E;
+				border-radius: 36rpx;
+			}
+
+			.popup-guige-item:not(:first-child) {
+				margin-left: 24rpx;
+			}
+		}
+
+		.goods-item-right-row4 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 24rpx 20rpx 0rpx 20rpx;
+
+			.price {
+				color: #FF874E;
+				font-weight: 600;
+			}
+
+			.count {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.decrease-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 6rpx;
+				}
+
+				text {
+					margin: 0 24rpx;
+				}
+
+				.increase-img {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 6rpx;
+				}
+			}
+		}
+
+		.popup-line {
+			height: 8rpx;
+			margin-top: 36rpx;
+			background-color: #F3F3F3;
+		}
+
+		.popup-detail {
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			group-title {
+				width: 100%;
+			}
+
+			.good-intro {
+				width: 672rpx;
+				color: #494949;
+				font-size: 32rpx;
+				margin-top: 20rpx;
+			}
+
+			.good-category {
+				width: 672rpx;
+				margin-top: 20rpx;
+				display: flex;
+				flex-wrap: wrap;
+
+				.good-category-item {
+					height: 42rpx;
+					padding-left: 20rpx;
+					padding-right: 20rpx;
+					background-color: #EFEFEF;
+					border-radius: 22rpx;
+					color: #656565;
+					font-size: 24rpx;
+					display: flex;
+					align-items: center;
+				}
+
+				.good-category-item:not(:first-child) {
+					margin-left: 24rpx;
+				}
+			}
+
+			.good-rule {
+				width: 672rpx;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				margin-bottom: 46rpx;
+
+				.good-rule-item {
+					box-sizing: border-box;
+					width: 324rpx;
+					height: 48rpx;
+					border: 2rpx solid #FF874E;
+					color: #FF874E;
+					font-size: 28rpx;
+					border-radius: 6rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
 }
 
 .jiaobiao {
-  width: 36rpx;
-  height: 36rpx;
-  background-color: #FF4C1A;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  font-size: 24rpx;
-  border-radius: 50rpx;
-  position: relative;
-  float: right;
-  bottom: 20rpx;
-  right: 10rpx;
+	width: 36rpx;
+	height: 36rpx;
+	background-color: #FF4C1A;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: white;
+	font-size: 24rpx;
+	border-radius: 50rpx;
+	position: relative;
+	float: right;
+	bottom: 20rpx;
+	right: 10rpx;
 }

pages/pintuandetail/pintuandetail.wxml

@@ -65,7 +65,7 @@
       <van-progress percentage="{{pintuandetail.speed_progress}}" inactive="{{pintuandetail.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
     </view>
     <view class="countdown-time" style="color: {{pintuandetail.gang_status == 0?'#989898':''}};">
-      {{pintuandetail.count_down}}
+      <count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{pintuandetail.time1 * 1000}}"></count-down>
     </view>
   </view>
   <!-- 拼团介绍 -->
@@ -74,15 +74,15 @@
     {{pintuandetail.gang_describe}}
   </view>
   <!-- 拼团视频 -->
-  <view class="pintuan-video">
+  <view class="pintuan-video" wx:if="{{pintuandetail.gang_video}}">
     <video src="{{pintuandetail.gang_video}}" show-center-play-btn play-btn-position="center" style="width: 100%;height: 100%;border-radius: 20rpx;"></video>
   </view>
   <!-- 拼团大图 -->
-  <view class="pintuan-datu">
+  <view class="pintuan-datu" wx:if="{{pintuandetail.gang_big_img}}">
     <image src="{{pintuandetail.gang_big_img}}" style="width: 100%;height: 100%;border-radius: 20rpx;"></image>
   </view>
   <!-- 拼团小图 -->
-  <view class="pintuan-xiaotu-container">
+  <view class="pintuan-xiaotu-container" wx:if="{{pintuandetail.gang_small_img != 0}}">
     <view class="pintuan-xiaotu-item column3" wx:for="{{pintuandetail.gang_small_img}}" wx:key="index" wx:for-index="index">
       <image src="{{item}}" style="width: 100%;height: 100%;border-radius: 20rpx;"></image>
     </view>
@@ -294,9 +294,9 @@
 <van-popup show="{{ showGoodDetail }}" round lock-scroll position="bottom" custom-style="height: 65%" bind:close="closeGoodDetail">
   <view class="popup">
     <view class="popup-swiper">
-      <swiper indicator-dots circular>
+      <swiper indicator-dots circular class="banner-box">
         <swiper-item wx:for="{{currentGood.commodity_img}}">
-          <image mode="widthFix" src="{{item}}"></image>
+          <image mode="aspectFit" src="{{item}}"></image>
         </swiper-item>
       </swiper>
     </view>

pages/pintuandetail/pintuandetail.wxss

@@ -129,6 +129,7 @@ page .pintuan-card {
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-bottom: 20rpx;
 }
 page .pintuan-card .pintuan-name {
   width: 652rpx;
@@ -774,12 +775,19 @@ page .popup .goods-item .goods-item-right .goods-item-right-row4 .count .increas
   height: 40rpx;
   border-radius: 6rpx;
 }
-page .popup .popup-swiper swiper {
-  width: 100%;
+page .popup .popup-swiper {
+  border-bottom: 1rpx solid #e4e4e4;
+}
+page .popup .popup-swiper .banner-box {
   height: 550rpx;
 }
-page .popup .popup-swiper swiper image {
+page .popup .popup-swiper .banner-box swiper-item {
+  background: #FFF;
+}
+page .popup .popup-swiper .banner-box swiper-item image {
+  background: #FFF;
   width: 100%;
+  height: 550rpx;
 }
 page .popup .popup-title {
   color: #494949;

pages/pintuanmanage/pintuanmanage.js

@@ -10,7 +10,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '拼团管理', //导航栏 中间的标题
+      title: '拼团管理', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: [
       "全部", "未发布", "已发布", "已截团"

pages/receipt/receipt.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '收款码', //导航栏 中间的标题
+      title: '收款码', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     userinfo: wx.getStorageSync('userinfo'),
     modalType: false, //弹框默认不显示

pages/requestrefund/requestrefund.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '退款申请', //导航栏 中间的标题
+      title: '退款申请', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //订单ID
     order_info: {}, //订单信息
@@ -130,10 +131,10 @@ Page({
   // 上传退款凭证
   uploadVoucher() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -147,6 +148,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',

pages/returnofdetail/returnofdetail.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '退款详情', //导航栏 中间的标题
+      title: '退款详情', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //订单id
     billdata: {}

pages/returnofgoods/returnofgoods.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '退货管理', //导航栏 中间的标题
+      title: '退货管理', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: ["全部", "未处理", "已处理"],
     indexs: 0,

pages/returnofmoney/returnofmoney.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '退款处理', //导航栏 中间的标题
+      title: '退款处理', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     id: 0, //订单id
     billdata: {},

pages/salestatistics/salestatistics.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '销售统计', //导航栏 中间的标题
+      title: '销售统计', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     maiJiaRankData: [],
   },

pages/search/search.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '搜索', //导航栏 中间的标题
+      title: '搜索', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     news: [], //历史搜索
     dingyues: [], //团长列表

pages/setting/setting.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '设置', //导航栏 中间的标题
+      title: '设置', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     version: api.Version
   },

pages/sharetofirend/sharetofirend.js

@@ -9,7 +9,8 @@ Page({
   data: {
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
-      title: '分享朋友圈', //导航栏 中间的标题
+      title: '分享朋友圈', //导航栏 中间的标题,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     news: [
       '生鲜', '教育', '熟食', '生鲜', '甜点糕点', '生活用品', '教育'

pages/treadsel/treadsel.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '行业选择', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     listdata: []
   },

pages/tuanzdetail/tuanzdetail.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     height: 0,
     classify: [],

pages/tuanzdetail/tuanzdetail.wxml

@@ -52,7 +52,7 @@
       <p>团长介绍</p>
     </view>
     <view class="intro-foot">
-      {{user_info.introduction}}
+      {{user_info.introduction || '未填写，请点击编辑开始设置'}}
     </view>
   </view>
 </view>

pages/tuanzdetail2/tuanzdetail2.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     height: 0,
     classify: [

pages/tuanzdetail2status/tuanzdetail2status.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     height: 0,
     classify: [

pages/tuanzdetail2status/tuanzdetail2status.wxml

@@ -57,7 +57,7 @@
       <p>团长介绍</p>
     </view>
     <view class="intro-foot">
-      {{user_info.introduction}}
+      {{user_info.introduction || '未填写，请点击编辑开始设置'}}
     </view>
   </view>
   <!-- 商品分类 -->

pages/tuanzdetail2status2/tuanzdetail2status2.js

@@ -8,32 +8,14 @@ Page({
    */
   data: {
     navbarData: {
-      showCapsule: 1
+      showCapsule: 1,
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     height: 0,
     classify: [
       "生鲜", "教育", "熟食", "生鲜", "教育", "熟食", "甜点糕点", "生活用品"
     ],
     sidetabs: ["全部", "肉类", "海鲜", "教育", "熟食", "生活用品"],
-    pintuan: [{
-      title: "拼团内容这里全是拼团内容",
-      plan: 67,
-      time: "倒计时3天12小时",
-      statu: 1,
-      goods: ['https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg']
-    }, {
-      title: "拼团内容这里又是拼团内容",
-      plan: 80,
-      time: "倒计时3天13小时",
-      statu: 1,
-      goods: ['https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg']
-    }, {
-      title: "拼团内容这里截团了",
-      plan: 100,
-      time: "2022-03-11 15:42",
-      statu: 0,
-      goods: ['https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg', 'https://img.alicdn.com/imgextra/i3/103680052/O1CN01DyoqTe1CFrKNUj4Gj_!!0-saturn_solar.jpg_270x270.jpg']
-    }],
     showphone: false,
     phone: [{
       name: ''

pages/tuanzdetail2status2/tuanzdetail2status2.wxml

@@ -54,7 +54,7 @@
       <p>团长介绍</p>
     </view>
     <view class="intro-foot">
-      {{user_info.introduction}}
+      {{user_info.introduction || '未填写，请点击编辑开始设置'}}
     </view>
   </view>
   <!-- 商品分类 -->

pages/userinfo/userinfo.js

@@ -10,6 +10,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     show: false, //显示二维码
     userinfo: {},
@@ -104,10 +105,10 @@ Page({
   // 上传头像
   uploadAvatar() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -121,6 +122,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',
@@ -180,10 +185,10 @@ Page({
   // 上传微信二维码
   uploadWechatCode() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -197,6 +202,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',
@@ -250,10 +259,10 @@ Page({
   // 上传主页背景
   uploadBackgroundImg() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -267,6 +276,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',
@@ -308,10 +321,10 @@ Page({
   // 上传用户收款码
   uploadCollectionCode() {
     let that = this;
-    wx.showLoading({
-      title: '文件上传中',
-      mask: true
-    })
+    // wx.showLoading({
+    //   title: '文件上传中',
+    //   mask: true
+    // })
     wx.request({
       url: api.getSignedUrl,
       data: {
@@ -325,6 +338,10 @@ Page({
           success: (img) => {
             console.log(img);
             let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+            wx.showLoading({
+              title: '文件上传中',
+              mask: true
+            })
             wx.uploadFile({
               filePath: img.tempFiles[0].tempFilePath,
               name: 'file',
@@ -370,78 +387,78 @@ Page({
       title: '提交中',
       mask: true
     })
-    if (that.data.headimg == '') {
-      wx.showToast({
-        title: '用户头像未上传',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.phone == '') {
-      wx.showToast({
-        title: '联系电话未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.address == '') {
-      wx.showToast({
-        title: '地址未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.wechat_number == '') {
-      wx.showToast({
-        title: '微信号未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.wechat_code == '') {
-      wx.showToast({
-        title: '微信二维码未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.email == '') {
-      wx.showToast({
-        title: '邮箱地址未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.introduction == '') {
-      wx.showToast({
-        title: '用户简介未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.background_img == '') {
-      wx.showToast({
-        title: '用户主页背景图未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
-    if (that.data.collection_code == '') {
-      wx.showToast({
-        title: '用户收款码未录入',
-        icon: 'none',
-        mask: true
-      })
-      return
-    }
+    // if (that.data.headimg == '') {
+    //   wx.showToast({
+    //     title: '用户头像未上传',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.phone == '') {
+    //   wx.showToast({
+    //     title: '联系电话未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.address == '') {
+    //   wx.showToast({
+    //     title: '地址未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.wechat_number == '') {
+    //   wx.showToast({
+    //     title: '微信号未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.wechat_code == '') {
+    //   wx.showToast({
+    //     title: '微信二维码未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.email == '') {
+    //   wx.showToast({
+    //     title: '邮箱地址未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.introduction == '') {
+    //   wx.showToast({
+    //     title: '用户简介未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.background_img == '') {
+    //   wx.showToast({
+    //     title: '用户主页背景图未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
+    // if (that.data.collection_code == '') {
+    //   wx.showToast({
+    //     title: '用户收款码未录入',
+    //     icon: 'none',
+    //     mask: true
+    //   })
+    //   return
+    // }
     wx.request({
       url: api.edit_info,
       header: {
@@ -470,8 +487,8 @@ Page({
             success() {
               app.getUserDetailInfo()
               setTimeout(() => {
-                wx.reLaunch({
-                  url: '/pages/mine/mine',
+                wx.navigateBack({
+                  delta: 1,
                 })
               }, 1500)
             }
@@ -496,5 +513,11 @@ Page({
         // wx.hideLoading()
       }
     })
-  }
+  },
+  // 立即去认证
+  navToRZ() {
+    wx.navigateTo({
+      url: '/pages/phonenumber/phonenumber',
+    })
+  },
 })

pages/userinfo/userinfo.wxml

@@ -18,7 +18,13 @@
   </view>
   <view>
     <view class="box_left">联系电话</view>
-    <view><input value="{{phone}}" bindinput="inputPhone" placeholder="请输入正确的手机号码" placeholder-style="color:#989898;font-siez:32rpx;" /></view>
+    <!-- <view><input value="{{phone}}" bindinput="inputPhone" placeholder="请输入正确的手机号码" placeholder-style="color:#989898;font-siez:32rpx;" /></view> -->
+    <view>
+    </view>
+    <view catchtap="navToRZ">
+      <text style="margin-right: 10rpx;">{{userinfo.phone || '立即认证'}}</text>
+      <image src="/images/go.png" class="go"></image>
+    </view>
   </view>
   <view>
     <view class="box_left">地址</view>
@@ -35,7 +41,7 @@
     </view>
   </view>
   <view>
-    <view class="box_left">邮箱地址</view>
+    <view class="box_left">EMT邮箱</view>
     <view><input value="{{email}}" bindinput="inputEmail" placeholder="请输入邮箱地址" placeholder-style="color:#989898;font-siez:32rpx;" /></view>
   </view>
   <view>
@@ -71,5 +77,6 @@
 <van-popup show="{{ show }}" bind:close="onClose" round="true">
   <view class="tanchu">
     <image src="{{wechat_code || '/images/qrcode.png'}}" catchtap="uploadWechatCode"></image>
+    <text>点击上传您的微信二维码</text>
   </view>
 </van-popup>

pages/userinfo/userinfo.wxss

@@ -89,6 +89,7 @@ input {
   display: flex;
   justify-content: center;
   align-items: center;
+  flex-direction: column;
 }
 
 .van-popup--center.van-popup--round {

pages/verifycode/verifycode.js

@@ -14,6 +14,7 @@ Page({
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '个人认证', //导航栏 中间的标题
+      capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
   },
   onLoad(options) {