api/request.js

@@ -0,0 +1,72 @@
+
+const api_url = 'https://sqtg.hdlkeji.com' //社区团购
+var requestHandler = {
+  url: "",
+  params: {},
+  success: function(res) {
+
+  },
+  fail: function() {
+
+  }
+}
+//GET
+function GET(requestHandler) {
+  request('GET', requestHandler)
+}
+//POST
+function POST(requestHandler) {
+  request_post('POST', requestHandler)
+}
+function request(method, requestHandler) {
+  var params = requestHandler.params;
+  var url = requestHandler.url;
+  wx.request({
+    url: api_url + url,
+    data: params,
+    method: method,
+    header: {
+      'Content-Type': 'application/json' // 默认值
+    },
+    success: function(res) {
+      requestHandler.success(res)
+    },
+    fail: function() {
+      requestHandler.fail();
+    }
+  })
+}
+
+function request_post(method, requestHandler) {
+  var params = requestHandler.params;
+  var url = requestHandler.url
+  var distanceType = requestHandler.distance;
+
+  wx.showLoading({
+    title: '加载中',
+    mask: true
+  })
+  wx.request({
+    url: api_url + url,
+    data: params,
+    method: method,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    },
+    success: function (res) {
+      wx.hideLoading();
+      requestHandler.success(res)
+    },
+    fail: function() {
+      requestHandler.fail();
+    }
+  })
+
+}
+
+
+module.exports = {
+  GET: GET,
+  POST: POST,
+  drawTextVertical: drawTextVertical
+}

app.json

@@ -107,6 +107,7 @@
     "search":"/compone/search/search",
     "nav-bar":"/compone/navbar/navbar",
     "order-card":"/compone/order-card/order-card",
+    "order-card2":"/compone/order-card2/order-card2",
     "order":"/compone/order/order",
     "group-title":"/compone/group-title/group-titlle",
     "calendar":"/compone/calendar/calendar",

compone/order-card/order-card.wxml

@@ -6,10 +6,10 @@
 		<view class="late-title">{{cardData.gang_name}}</view>
 		<!-- 进度条 -->
 		<view class="late-progress">
-			<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
+			<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
 		</view>
 		<!-- 倒计时 -->
-		<view class="late-time" style="color: {{cardData.gang_status == 0?'#989898':''}};">
+		<view class="late-time" style="color: {{cardData.status == 0?'#989898':''}};">
 			<count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{cardData.time1 * 1000}}"></count-down>
 		</view>
 		<!-- 用户信息 -->
@@ -18,7 +18,8 @@
 				<van-image round width="50rpx" style="margin-top: 8rpx;" fit="cover" height="50rpx" src="{{cardData.headimg}}" />
 				<p>{{cardData.name}}</p>
 			</view>
-			<p class="late-c-p" wx:if="{{cardData.gang_status == 1}}">拼团中</p>
+			<p class="late-c-p" wx:if="{{cardData.status == 1}}">拼团中</p>
+			<p class="late-c-p" style="color: #989898;" wx:elif="{{cardData.status == 2}}">未发布</p>
 			<p class="late-c-p" wx:else style="color: #989898;">已截团</p>
 		</view>
 		<!-- 商品图片 -->
@@ -45,10 +46,10 @@
 			</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" />
+				<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.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':''}};">
+			<view class="late1-time" style="color: {{cardData.status == 0?'#989898':''}};">
 				<count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{cardData.time1 * 1000}}"></count-down>
 			</view>
 			<!-- 用户信息 -->
@@ -57,7 +58,8 @@
 					<van-image round width="50rpx" style="margin-top: 8rpx;" fit="cover" height="50rpx" src="{{cardData.headimg}}" />
 					<p>{{cardData.name}}</p>
 				</view>
-				<p class="late1-c-p" wx:if="{{cardData.gang_status == 1}}">拼团中</p>
+				<p class="late1-c-p" wx:if="{{cardData.status == 1}}">拼团中</p>
+			<p class="late-c-p" style="color: #989898;" wx:elif="{{cardData.status == 2}}">未发布</p>
 				<p class="late1-c-p" wx:else style="color: #989898;">已截团</p>
 			</view>
 		</view>

compone/order-card2/order-card2.js

@@ -0,0 +1,31 @@
+// compone/order-card/order-card.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    cardData:{
+      type: Object,
+      value: {},
+      observer: function (newVal, oldVal) {}
+    },
+    width:{
+      type: Number,
+      value: 710
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    CardData:{}
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

compone/order-card2/order-card2.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-image": "@vant/weapp/image/index",
+    "van-progress": "@vant/weapp/progress/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}

compone/order-card2/order-card2.wxml

@@ -0,0 +1,72 @@
+<!--compone/order-card/order-card.wxml-->
+<!-- 商品数量不为1 -->
+<view class="lately" style="width: {{width + 'rpx'}};" wx:if="{{cardData.commodity_list.length != 1}}">
+	<view class="late-body">
+		<!-- 拼团名称 -->
+		<view class="late-title">{{cardData.gang_name}}</view>
+		<!-- 发布时间到截至时间 -->
+		<view style="font-size: 28rpx;">{{cardData.opening_time}} 到 {{cardData.closing_time}}</view>
+		<!-- 进度条 -->
+		<view class="late-progress">
+			<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
+		</view>
+		<!-- 倒计时 -->
+		<view class="late-time" style="color: {{cardData.status == 0?'#989898':''}};">
+			<count-down format="{DD}天{HH}时{mm}分{ss}秒" endTime="{{cardData.time1 * 1000}}"></count-down>
+		</view>
+		<!-- 用户信息 -->
+		<view class="late-content">
+			<view class="late-c-b">
+				<van-image round width="50rpx" style="margin-top: 8rpx;" fit="cover" height="50rpx" src="{{cardData.headimg}}" />
+				<p>{{cardData.name}}</p>
+			</view>
+			
+			<p class="late-c-p" wx:if="{{cardData.status == 1}}">拼团中</p>
+			<p class="late-c-p" style="color: #989898;" wx:elif="{{cardData.status == 2}}">未发布</p>
+			<p class="late-c-p" wx:else style="color: #989898;">已截团</p>
+		</view>
+		<!-- 商品图片 -->
+		<view class="late-items">
+			<scroll-view class="late-scroll" scroll-x="true">
+				<van-image radius="10" width="70" height="70" src="{{items.commodity_img}}" wx:for="{{cardData.commodity_list}}" wx:key="{{index}}" wx:for-item="items" class="late-img" wx:key="indexs" />
+			</scroll-view>
+			<view class="late-num">
+				<p>共{{cardData.commodity_number}}件</p>
+				<image src="/images/go.png"></image>
+			</view>
+		</view>
+	</view>
+</view>
+<!-- 商品数量为1 -->
+<view class="lately-1" style="width: {{width + 'rpx'}};" wx:if="{{cardData.commodity_list.length == 1}}">
+	<view class="late1-body">
+		<!-- 商品图片 -->
+		<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 style="font-size: 22rpx;margin-top:4rpx">开团时间：{{cardData.opening_time}}</view>
+			<view style="font-size: 22rpx;margin-top:4rpx;margin-bottom:4rpx;">截止时间：{{cardData.closing_time}}</view>
+			<!-- 进度条 -->
+			<view class="late1-progress">
+				<van-progress percentage="{{cardData.speed_progress}}" inactive="{{cardData.status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
+			</view>
+			<!-- 倒计时 -->
+			<view class="late1-time" style="color: {{cardData.status == 0?'#989898':''}};">
+				<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}}" />
+					<p>{{cardData.name}}</p>
+				</view>
+				<p class="late1-c-p" wx:if="{{cardData.status == 1}}">拼团中</p>
+			<p class="late-c-p" style="color: #989898;" wx:elif="{{cardData.status == 2}}">未发布</p>
+				<p class="late1-c-p" wx:else style="color: #989898;">已截团</p>
+			</view>
+		</view>
+	</view>
+</view>

compone/order-card2/order-card2.wxss

@@ -0,0 +1,161 @@
+/* compone/order-card/order-card.wxss */
+.lately{
+  /* width: 710rpx; */
+  margin-top: 20rpx;
+  height: 414rpx;
+  background-color: white;
+  border-radius: 20rpx;
+  box-shadow: 0px 0px 4px #d1d1d1;
+  display: flex;
+  justify-content: center;
+}
+.late-body{
+  width: 92%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.late-title{
+  height: 80rpx;
+  width: 100%;
+  margin-top: 10rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #464646;
+}
+.late-progress{
+  height: 16rpx;
+  width: 100%;
+}
+.late-c-b{
+  display: flex;
+  height: 100%;
+  width: 300rpx;
+  align-items: center;
+}
+.late-c-b p {
+  margin-left: 20rpx;
+  font-size: 32rpx;
+  color: #464646;
+  font-weight: 600;
+}
+.late-time{
+  margin-top: -15rpx;
+  width: 100%;
+  height: 30rpx;
+  font-size: 22rpx;
+  color:#F35E5E;
+  display: flex;
+  flex-direction: row-reverse;
+}
+.late-c-p{
+  color: #11CD6A;
+  font-size: 26rpx;
+}
+.late-content{
+  margin-top: -20rpx;
+  width: 100%;
+  height: 50rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.late-items{
+  /* height: 130rpx; */
+  width: 100%;
+  margin-top: -20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.late-scroll{
+  display: flex;
+  width: 82%;
+  /* height: 100%; */
+  white-space: nowrap;
+}
+.late-scroll .van-image image{
+  border-radius: 10rpx;
+}
+.late-img:not(:first-child) {
+  margin-left: 25rpx;
+}
+.late-num{
+  display: flex;
+  width: 100rpx;
+  height: 100%;
+  align-items: center;
+  /* font-size: 30rpx; */
+  font-size: 24rpx;
+  color: #656565;
+}
+.late-num image{
+  height: 26rpx;
+  width: 22rpx;
+}
+.forlate{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.lately-1{
+  width: 710rpx;
+  height: 270rpx;
+  margin-top: 30rpx;
+  background-color: white;
+  border-radius: 20rpx;
+  box-shadow: 0px 0px 4px #d1d1d1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.late1-body{
+  width: 92%;
+  display: flex;
+  justify-content: space-between;
+  height: 210rpx;
+}
+.late1-body .van-image image{
+  border-radius: 20rpx;
+}
+.late1-cont{
+  width: 64%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-left: 26rpx;
+}
+.late1-title{
+  font-size: 28rpx;
+  font-weight: 550;
+}
+.late1-time{
+  display: flex;
+  flex-direction: row-reverse;
+  color: #F35E5E;
+  font-size: 22rpx;
+}
+.late1-content{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.late1-c-b{
+  height: 100%;
+  display: flex;
+  align-items: center;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #464646;
+
+}
+.late1-c-b p{
+  margin-left: 20rpx;
+}
+.late1-c-p{
+  font-size: 24rpx;
+  color: #11CD6A;
+}

mocks/pintuan.js

@@ -18,7 +18,7 @@ export default [{
       }
     ],
     commodity_number: 2,
-    gang_status: 1,
+    status: 1,
     count_down: "12天0小时44分54秒"
   },
   {
@@ -51,7 +51,7 @@ export default [{
       }
     ],
     commodity_number: 4,
-    gang_status: 1,
+    status: 1,
     count_down: "12天0小时44分54秒"
   },
   {
@@ -68,7 +68,7 @@ export default [{
       commodity_img: "https://puse-blog.oss-cn-beijing.aliyuncs.com/school-upload/0382586027774754.jpg"
     }],
     commodity_number: 4,
-    gang_status: 1,
+    status: 1,
     count_down: "12天0小时44分54秒"
   }
 ]

pages/addtogood/addtogood.js

@@ -432,6 +432,7 @@ Page({
         specificationText: this.data.specifications[0].title + '/' + this.data.specifications[0].price + '加币',
       })
     }
+    console.log(e.detail.value)
     this.setData({
       price: e.detail.value
     })

pages/addtogood/addtogood.wxss

@@ -290,7 +290,7 @@ page {
 }
 
 .addladder>button {
-  width: 194rpx;
+  width: 197rpx;
   margin-left: 2rpx;
   height: 54rpx;
   border: 1px solid #FF874E;

pages/announce/announce.js

@@ -419,44 +419,12 @@ Page({
         success: (oss) => {
           console.log(oss);
           wx.chooseMedia({
-            count: 1,
+            count: 5,
             mediaType: ['image'],
             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',
-                url: 'https://' + oss.data.data.host, //输入你的bucketname.endpoint
-                formData: {
-                  key: key,
-                  policy: oss.data.data.policy, // 输入你获取的的policy
-                  OSSAccessKeyId: oss.data.data.OSSAccessKeyId, // 输入你的AccessKeyId
-                  success_action_status: '200', // 让服务端返回200,不然，默认会返回204
-                  signature: oss.data.data.Signature, // 输入你获取的的signature
-                },
-                success: (res) => {
-                  if (res.statusCode == 200) {
-                    let src = 'https://' + oss.data.data.host + '/' + key;
-                    console.log(src);
-                    let oldSmallImageList = that.data.smallImageList;;
-                    oldSmallImageList.push(src);
-                    that.setData({
-                      smallImageList: oldSmallImageList
-                    })
-                  }
-                },
-                fail: (err) => {
-                  console.log(err);
-                },
-                complete: () => {
-                  wx.hideLoading()
-                }
-              })
+              
+              this.uploadFileImg(img,0,oss)
+                
             },
             fail: (err) => {
               wx.hideLoading()
@@ -469,6 +437,48 @@ Page({
       })
     }
   },
+  uploadFileImg(img,i,oss){
+    let that = this;
+    let key = "image/" + new Date().getTime() + Math.floor(Math.random() * 150) + '.png';
+    wx.showLoading({
+      title: '文件上传中',
+      mask: true
+    })
+    wx.uploadFile({
+      filePath: img.tempFiles[i].tempFilePath,
+      name: 'file',
+      url: 'https://' + oss.data.data.host, //输入你的bucketname.endpoint
+      formData: {
+        key: key,
+        policy: oss.data.data.policy, // 输入你获取的的policy
+        OSSAccessKeyId: oss.data.data.OSSAccessKeyId, // 输入你的AccessKeyId
+        success_action_status: '200', // 让服务端返回200,不然，默认会返回204
+        signature: oss.data.data.Signature, // 输入你获取的的signature
+      },
+      success: (res) => {
+        if (res.statusCode == 200) {
+          let src = 'https://' + oss.data.data.host + '/' + key;
+          console.log(src);
+          let oldSmallImageList = that.data.smallImageList;
+          oldSmallImageList.push(src);
+          that.setData({
+            smallImageList: oldSmallImageList
+          })
+          if (++i< img.tempFiles.length) {
+            this.uploadFileImg(img,i,oss)
+            // that.getammeternumber(fileList, i, length,dataset,skushowpricekey);
+          }else{}
+        }
+      },
+      fail: (err) => {
+        console.log(err);
+      },
+      complete: (complete) => {
+        console.log(complete)
+        wx.hideLoading()
+      }
+    })
+  },
   // 上传视频
   uploadVideo() {
     let that = this;
@@ -611,15 +621,19 @@ Page({
   },
   // 复选框改变
   checkBoxChange(event) {
+    
     let that = this;
     that.setData({
       checkBoxResult: event.detail,
     })
     const items = that.data.mockData;
     const values = event.detail;
+    console.log(event.detail)
     for (let i = 0, lenI = items.length; i < lenI; ++i) {
       items[i].xuan = false
       for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
+        console.log(items[i].id)
+        console.log(values[j])
         if (items[i].id == values[j]) {
           items[i].xuan = true
           break
@@ -1472,12 +1486,33 @@ Page({
       return
     }
     /* 必录校验-结束 */
+    // return;
     // 开始提交
     wx.showLoading({
       title: '提交中',
       mask: true
     })
     if (that.data.type == 'edit') {
+      console.log({
+        id: that.data.id,
+        gang_name: gang_name,
+        gang_describe: gang_describe,
+        gang_big_img: gang_big_img,
+        gang_small_img: gang_small_img,
+        gang_video: gang_video,
+        opening_time: opening_time,
+        closing_time: closing_time,
+        logistics_mode: logistics_mode,
+        expected_arrival_time: expected_arrival_time,
+        background_img: background_img,
+        cover_img: cover_img,
+        wechat_payment: wechat_payment,
+        search: search,
+        show_list: show_list,
+        comment: comment,
+        seller_forwarding: seller_forwarding,
+        receiving_information: receiving_information
+      },)
       wx.request({
         url: api.Gang_edit,
         header: {

pages/announce/announce.wxml

@@ -55,11 +55,11 @@
     <view class="jieshao-datu" wx:if="{{bigImageList.length !== 0}}">
       <view>
         <p>拼团大图</p>
-        <image src="../../images/del.png" mode="widthFix" bindtap="clearBigImageList"></image>
+        <image src="../../images/del.png" class="image" mode="widthFix" bindtap="clearBigImageList"></image>
       </view>
       <view class="jieshao-datu-box" wx:for="{{bigImageList}}" wx:key="index" wx:for-index="index">
-        <image src="{{item}}" style="width: 100%;height: 100%;border-radius: 20rpx;"></image>
-        <image src="../../images/jian.png" data-index="{{index}}" catchtap="deleteBigImage"></image>
+        <image src="{{item}}" style="width: 100%;border-radius: 20rpx;"></image>
+        <image src="../../images/jian.png" class="image" data-index="{{index}}" catchtap="deleteBigImage"></image>
       </view>
     </view>
     <!-- 拼图小图 -->
@@ -277,11 +277,11 @@
         <p class="row-title">其他设置</p>
         <van-icon class="row-suffix" name="arrow-down" size="28rpx" color="#656565" />
       </view>
-      <view class="row2">
+      <!-- <view class="row2">
         <p class="row2-title">是否开启微信支付</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> -->
       <view class="row2">
         <p class="row2-title">是否允许搜索</p>
         <van-switch checked="{{ search }}" active-value="{{1}}" inactive-value="{{0}}" active-color="#FF874E" inactive-color="#656565" size="19" bind:change="changeIsAllowSearch" />

pages/announce/announce.wxss

@@ -238,7 +238,7 @@ page {
   margin-bottom: 20rpx;
 }
 
-.jieshao-datu view image {
+.jieshao-datu view .image {
   position: absolute;
   right: 0;
   width: 44rpx;
@@ -246,7 +246,7 @@ page {
 }
 
 .jieshao-datu-box {
-  height: 470rpx;
+  /* height: 470rpx; */
   background-color: #fff;
   border-radius: 20rpx;
   position: relative;

pages/companydetail/companydetail.wxml

@@ -10,7 +10,7 @@
     </view>
     <!-- <view class="four">信用卡收款金额：C$278.8</view> -->
     <view class="five">
-      <p>微信支付收款金额：C${{gang_info.wx_income}}</p>
+      <!-- <p>微信支付收款金额：C${{gang_info.wx_income}}</p> -->
       <p>手续费比例：{{gang_info.service_charge}}%</p>
     </view>
   </view>

pages/companydetailinfo/companydetailinfo.wxml

@@ -20,7 +20,7 @@
       </view>
       <view class="right">
         <text wx:if="{{billdata.payment_method === null}}">暂无数据</text>
-        <text wx:if="{{billdata.payment_method === 0}}">微信支付</text>
+        <!-- <text wx:if="{{billdata.payment_method === 0}}">微信支付</text> -->
         <text wx:if="{{billdata.payment_method === 1}}">EMT支付</text>
         <text wx:if="{{billdata.payment_method === 2}}">线下支付</text>
       </view>

pages/confirmorder/confirmorder.js

@@ -32,9 +32,10 @@ Page({
     remarks: '', //备注
     logistics_mode: 0, //物流方式（0没有物流，1取货点自提，2送货或者自提）
     expected_arrival_time: '', //预计到货时间
+    user_name: '', //团长名称
     head_email: '', //团长邮箱
     order_number: '', //订单号
-
+    editFormPhone:'',//预留手机号
     ziquAddress: [], //自取点列表
     ziquIndex: 0,
     peisongAddress: [], //配送列表
@@ -58,6 +59,7 @@ Page({
       gang_name: options.gang_name,
       logistics_mode: Number(options.logistics_mode),
       head_phone: options.head_phone,
+      user_name: options.user_name,
       expected_arrival_time: options.expected_arrival_time,
       shopcart: wx.getStorageSync('shopcart')
     })
@@ -95,8 +97,13 @@ Page({
           console.log(res);
           if (res.data.code === 1) {
             that.setData({
-              ziquAddress: res.data.data
+              ziquAddress: res.data.data,
             })
+            if(res.data.data.length!=0){
+              that.setData({
+                editFormPhone:res.data.data[0].phone,
+              })
+            }
           } else {
             wx.showToast({
               title: res.data.msg,
@@ -229,6 +236,58 @@ Page({
       showBottomBar: true
     })
   },
+  // 修改地址
+  submitEdit() {
+    let that = this;
+
+    if (that.data.editFormPhone == '') {
+      wx.showToast({
+        title: '手机号未录入',
+        icon: 'none', 
+        mask: true
+      })
+      return
+    }
+    wx.request({
+      url: api.Gang_point_edit,
+      header: {
+        'Authorization': wx.getStorageSync('token')
+      },
+      method: 'POST',
+      data: {
+        id: that.data.ziquAddress[that.data.ziquIndex].id,
+        name: that.data.ziquAddress[that.data.ziquIndex].name,
+        address: that.data.ziquAddress[that.data.ziquIndex].address,
+        remarks: that.data.ziquAddress[that.data.ziquIndex].remarks,
+        phone: that.data.editFormPhone
+      },
+      success(res) {
+        console.log(res);
+        wx.hideLoading()
+        if (res.data.code === 1) {
+          console.log('修改手机号成功')
+          that.openPayTypePicker()
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+            mask: true,
+            icon: 'none'
+          })
+        }
+      },
+      fail(err) {
+        wx.hideLoading()
+        wx.showToast({
+          title: '发起网络请求失败',
+          icon: 'none',
+          mask: true
+        })
+      },
+      complete() {
+        // wx.hideLoading()
+      }
+    })
+  },
   // 下单
   openPayTypePicker() {
     let that = this;
@@ -305,7 +364,7 @@ Page({
             remarks: that.data.remarks,
             commodity_list: arr,
             consignee: that.data.peisongAddress[that.data.peisongIndex].receiving_name,
-            phone: that.data.peisongAddress[that.data.peisongIndex].receiving_phone,
+            phone: that.data.editFormPhone,
             receiving_address: that.data.peisongAddress[that.data.peisongIndex].receiving_address
           },
           method: 'POST',
@@ -350,11 +409,11 @@ Page({
             original_price: that.data.all_scribe_price,
             discount: that.data.all_scribe_price - that.data.all_price,
             payment_amount: that.data.all_price,
-            remarks: that.data.remarks,
+            // remarks: that.data.remarks,  备注改成预留手机号 暂且注释
             commodity_list: arr,
             self_access_point: that.data.ziquAddress[that.data.ziquIndex].address,
             point_remarks: that.data.ziquAddress[that.data.ziquIndex].remarks,
-            reserved_phone: that.data.ziquAddress[that.data.ziquIndex].phone
+            reserved_phone: that.data.remarks
           },
           method: 'POST',
           success(res) {
@@ -636,6 +695,11 @@ Page({
       remarks: e.detail.value
     })
   },
+  inputRemarksPhone(e) {
+    this.setData({
+      editFormPhone: e.detail.value
+    })
+  },
   // 选择配送地址
   choosePeisongAddress(e) {
     this.setData({
@@ -649,7 +713,8 @@ Page({
     this.setData({
       ziquIndex: e.currentTarget.dataset.index,
       showSelfMention: false,
-      showBottomBar: true
+      showBottomBar: true,
+      editFormPhone:this.data.ziquAddress[e.currentTarget.dataset.index].phone
     })
   },
   // 联系团长

pages/confirmorder/confirmorder.wxml

@@ -31,16 +31,17 @@
           <van-icon name="arrow" />
         </view>
       </view>
-      <view class="selfmention-row">
+      <!-- <view class="selfmention-row">
         <view class="selfmention-row-left">预留电话</view>
         <view class="selfmention-row-right">
           <text style="color: #464646;font-size: 28rpx;">{{ziquAddress[ziquIndex].phone}}</text>
         </view>
-      </view>
+      </view> -->
       <view class="selfmention-row">
         <view class="selfmention-row-left">团长名称</view>
         <view class="selfmention-row-right">
-          <text style="color: #989898;font-size: 28rpx;">{{ziquAddress[ziquIndex].name}}</text>
+          <!-- <text style="color: #989898;font-size: 28rpx;">{{ziquAddress[ziquIndex].name}}</text> -->
+          <text style="color: #989898;font-size: 28rpx;">{{user_name}}</text>
         </view>
       </view>
       <view class="selfmention-row">
@@ -55,10 +56,11 @@
       <view class="selfmention-row">
         <view class="selfmention-row-left">预计到货时间</view>
         <view class="selfmention-row-right">
-          <text style="color: #989898;font-size: 28rpx;">{{expected_arrival_time}}</text>
+          <text wx:if="{{expected_arrival_time!=''}}" style="color: #989898;font-size: 28rpx;">{{expected_arrival_time}}</text>
+          <text wx:if="{{expected_arrival_time==''}}" style="color: #FF874E;font-size: 28rpx;">具体时间等待团长发通知</text>
         </view>
       </view>
-      <view class="selfmention-tips">
+      <view class="selfmention-tips" wx:if="{{expected_arrival_time!=''}}">
         具体时间等待团长发通知
       </view>
     </view>
@@ -73,16 +75,17 @@
           <van-icon name="arrow" />
         </view>
       </view>
-      <view class="selfmention-row">
+      <!-- <view class="selfmention-row">
         <view class="selfmention-row-left">预留电话</view>
         <view class="selfmention-row-right">
           <text style="color: #464646;font-size: 28rpx;">{{ziquAddress[ziquIndex].phone}}</text>
         </view>
-      </view>
+      </view> -->
       <view class="selfmention-row">
         <view class="selfmention-row-left">团长名称</view>
         <view class="selfmention-row-right">
-          <text style="color: #989898;font-size: 28rpx;">{{ziquAddress[ziquIndex].name}}</text>
+          <!-- <text style="color: #989898;font-size: 28rpx;">{{ziquAddress[ziquIndex].name}}</text> -->
+          <text style="color: #989898;font-size: 28rpx;">{{user_name}}</text>
         </view>
       </view>
       <view class="selfmention-row">
@@ -97,10 +100,11 @@
       <view class="selfmention-row">
         <view class="selfmention-row-left">预计到货时间</view>
         <view class="selfmention-row-right">
-          <text style="color: #989898;font-size: 28rpx;">{{expected_arrival_time}}</text>
+          <text wx:if="{{expected_arrival_time!=''}}" style="color: #989898;font-size: 28rpx;">{{expected_arrival_time}}</text>
+          <text wx:if="{{expected_arrival_time==''}}" style="color: #FF874E;font-size: 28rpx;">具体时间等待团长发通知</text>
         </view>
       </view>
-      <view class="selfmention-tips">
+      <view class="selfmention-tips" wx:if="{{expected_arrival_time!=''}}">
         具体时间等待团长发通知
       </view>
     </view>
@@ -135,7 +139,9 @@
   </view>
   <!-- 备注信息 -->
   <view class="remark-info">
-    <input type="text" value="{{remarks}}" bindinput="inputRemarks" placeholder="请输入备注信息" placeholder-class="placeholder" />
+    <view class="remarkText" wx:if="{{tabType != 'wuliu'}}">预留电话</view>
+    <input type="number" wx:if="{{tabType != 'wuliu'}}" value="{{editFormPhone}}" bindinput="inputRemarksPhone" placeholder="点此输入" placeholder-class="placeholder" />
+    <input type="text" wx:if="{{tabType == 'wuliu'}}" value="{{remarks}}" bindinput="inputRemarks" placeholder="请输入备注信息" placeholder-class="placeholder" />
   </view>
 </view>
 <!-- 底部栏-下单 -->
@@ -149,7 +155,7 @@
       <text class="foot-row-left-text">{{all_price}}</text>
     </view>
     <view class="foot-row-right">
-      <view class="foot-row-right-btn" bindtap="openPayTypePicker">下单</view>
+      <view class="foot-row-right-btn" bindtap="submitEdit">下单</view>
     </view>
   </view>
 </view>

pages/confirmorder/confirmorder.wxss

@@ -7,6 +7,9 @@ page .body {
   width: 710rpx;
   margin: 0 auto;
 }
+page .selfmention{
+  padding-bottom: 10rpx;
+}
 page .body .tab-box {
   width: 100%;
   min-height: 324rpx;
@@ -192,12 +195,15 @@ page .body .pintuan-card .all-price .all-price-right {
   display: flex;
   align-items: center;
 }
+page .body .remark-info .remarkText{
+  font-size: 32rpx;
+}
 page .body .remark-info {
   height: 128rpx;
   border-radius: 20rpx;
   background-color: #FFFFFF;
+  padding: 20rpx 42rpx;
   margin-top: 30rpx;
-  padding-left: 42rpx;
   margin-bottom: 30rpx;
 }
 page .body .remark-info .placeholder {

pages/index/index.wxml

@@ -42,7 +42,7 @@
   <view class="tinfo" wx:if="{{zhong == 1}}">
     <view style="width: 710rpx;height: 82rpx;background-color: white;border-radius: 50rpx;display: flex;align-items: center;justify-content: space-around;margin: 0 auto;">
       <van-icon name="search" style="font-size: 40rpx;color: #A4A4A4;margin-left: 30rpx;" />
-      <input type="text" placeholder="搜索" placeholder-style="color:#989898;" style="height: 100%;width: 84%;" value="{{goodName}}" bindinput="inputGoodName"></input>
+      <input type="text" placeholder="搜索" placeholder-style="color:#989898;" style="height: 100%;width: 84%;" value="{{goodName}}" bindconfirm="inputGoodName" bindinput="inputGoodName"></input>
     </view>
     <view class="forlate" wx:key="index">
       <order-card wx:for="{{pintuan}}" cardData="{{item}}" data-id="{{item.id}}" bindtap="navToPinTuanDetail"></order-card>

pages/myhomepage/myhomepage.wxml

@@ -19,12 +19,16 @@
 			<view>
 				<p>{{user_info.name}}</p>
 				<!-- 订阅团长 -->
-				<button wx:if="{{enterType === 0 && !isSubscription}}" catchtap="subscription" style="background-color: #FF874E">
-					<p>订阅</p>
-				</button>
-				<button wx:if="{{enterType === 0 && isSubscription}}" catchtap="subscription" style="background-color: #D2D2D2">
-					<p>已订阅</p>
-				</button>
+				<view></view>
+				
+				<view class="btn" wx:if="{{enterType === 0 && !isSubscription}}" >
+				<van-switch  active-color="#FF874E" checked="{{ !(enterType === 0 && !isSubscription) }}"  size="20px" bind:change="subscription" />
+					<p style="background-color: #FF874E" >订阅</p>
+				</view >
+				<view class="btn" wx:if="{{enterType === 0 && isSubscription}}" >
+				<van-switch  active-color="#FF874E" checked="{{ !(enterType === 0 && !isSubscription) }}"  size="20px" bind:change="subscription" />
+					<p style="background-color: #D2D2D2" >已订阅</p>
+				</view >
 				<!-- 编辑信息 -->
 				<p wx:if="{{enterType === 1}}" style="color:#FF874E;font-size:28rpx;font-weight: 500;" bindtap="gobianji">编辑 ></p>
 			</view>

pages/myhomepage/myhomepage.wxss

@@ -79,9 +79,19 @@ page{
   display: flex;
   position: relative;
 }
-.body-center>view>button{
-    width: 86rpx;
-    height: 44rpx;
+.body-center>view>.btn>p{
+  width: 86rpx;
+  text-align: center;
+  height: 44rpx;
+  line-height: 44rpx;
+  /* background-color: #D2D2D2; */
+  border-radius: 12rpx;
+  margin-left: 8rpx;
+}
+.body-center>view>.btn{
+    /* width: 86rpx; */
+    /* height: 44rpx; */
+    border: 0;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -92,6 +102,7 @@ page{
     font-weight: 500;
     position: absolute;
     left: 160rpx;
+    top: 0;
 }
 .meat{
   width: 100%;
@@ -272,7 +283,7 @@ page{
   flex-direction: column-reverse;
 }
 .share-right>button{
-  width: 140rpx;
+  width: 146rpx;
   height: 74rpx;
   background-color: #FF874E;
   display: flex;

pages/orderdetail/orderdetail.wxml

@@ -135,7 +135,7 @@
       <view class="order-card-row" wx:if="{{order_info.order_status === 2 || order_info.order_status === 1 || orderStatus === 5}}">
         <text class="left">支付方式</text>
         <text class="right" wx:if="{{order_info.payment_method == null}}">未付款</text>
-        <text class="right" wx:if="{{order_info.payment_method == 0}}">微信支付</text>
+        <!-- <text class="right" wx:if="{{order_info.payment_method == 0}}">微信支付</text> -->
         <text class="right" wx:if="{{order_info.payment_method == 1}}">信用卡支付</text>
         <text class="right" wx:if="{{order_info.payment_method == 2}}">EMT支付</text>
         <text class="right" wx:if="{{order_info.payment_method == 3}}">线下支付</text>

pages/orderstatus/orderstatus.wxml

@@ -116,7 +116,7 @@
       <view class="order-card-row" wx:if="{{order_info.order_status === 2 || order_info.order_status === 1 || orderStatus === 5}}">
         <text class="left">支付方式</text>
         <text class="right" wx:if="{{order_info.payment_method == null}}">未付款</text>
-        <text class="right" wx:if="{{order_info.payment_method == 0}}">微信支付</text>
+        <!-- <text class="right" wx:if="{{order_info.payment_method == 0}}">微信支付</text> -->
         <text class="right" wx:if="{{order_info.payment_method == 1}}">信用卡支付</text>
         <text class="right" wx:if="{{order_info.payment_method == 2}}">EMT支付</text>
         <text class="right" wx:if="{{order_info.payment_method == 3}}">线下支付</text>

pages/pintuanchoose/pintuanchoose.wxml

@@ -16,11 +16,11 @@
               {{item.gang_name}}
             </view>
             <view class="late1-progress">
-              <van-progress percentage="{{item.speed_progress}}" inactive="{{item.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
+              <van-progress percentage="{{item.speed_progress}}" inactive="{{item.status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
             </view>
             <view class="late1-content">
-              <p class="late1-c-p" wx:if="{{item.gang_status == 1}}" style="color: #F35E5E;">{{item.count_down}}</p>
-              <p class="late1-c-p" wx:if="{{item.gang_status == 1}}">拼团中</p>
+              <p class="late1-c-p" wx:if="{{item.status == 1}}" style="color: #F35E5E;">{{item.count_down}}</p>
+              <p class="late1-c-p" wx:if="{{item.status == 1}}">拼团中</p>
               <p class="late1-c-p" wx:else style="color: #989898;">已截团</p>
             </view>
           </view>

pages/pintuandetail/pintuandetail.js

@@ -84,7 +84,7 @@ Page({
           that.setData({
             pintuandetail: res.data.data
           })
-          if (that.data.pintuandetail.gang_status == 0) {
+          if (that.data.pintuandetail.status == 2) {
             let manageMenus = that.data.manageMenus;
             manageMenus.push({
               name: '开启拼团'
@@ -92,7 +92,7 @@ Page({
             that.setData({
               manageMenus
             })
-          } else if (that.data.pintuandetail.gang_status == 1) {
+          } else if (that.data.pintuandetail.status == 1) {
             let manageMenus = that.data.manageMenus;
             manageMenus.push({
               name: '截止拼团'
@@ -215,6 +215,16 @@ Page({
               res.data.data[i].step_index = 0;
             }
           }
+          // 商品数量少于3时只能使用列表展示
+          if(res.data.data.length>3){
+            that.setData({
+              goodCardMode: true
+            })  
+          }else{
+            that.setData({
+              goodCardMode: false
+            })
+          }
           that.setData({
             goods: res.data.data
           })
@@ -356,8 +366,9 @@ Page({
    */
   onShareAppMessage() {
     let pintuan_id = this.data.pintuandetail.id; //订单ID
+    
     return {
-      title: '拼团分享',
+      title: this.data.pintuandetail.user_info.name +'  '+ this.data.pintuandetail.gang_name,
       path: '/pages/pintuandetail/pintuandetail?type=dingyue&id=' + pintuan_id,
       imageUrl: this.data.pintuandetail.cover_img
     }
@@ -517,6 +528,15 @@ Page({
             all_price: 0,
             all_scribe_price: 0
           })
+          if(res.data.data.length>3){
+            that.setData({
+              goodCardMode: true
+            })  
+          }else{
+            that.setData({
+              goodCardMode: false
+            })
+          }
         } else {
           wx.showToast({
             title: res.data.msg,
@@ -944,7 +964,7 @@ Page({
   placeOrder() {
     let that = this;
     // 已闭团无法购买商品
-    if (that.data.pintuandetail.gang_status == 0) {
+    if (that.data.pintuandetail.status == 0) {
       wx.showToast({
         title: '该拼团已结束，无法下单',
         mask: true,
@@ -971,11 +991,12 @@ Page({
     let shopcart = that.data.shopcart; //购物车
     let logistics_mode = that.data.pintuandetail.logistics_mode; //物流方式（0没有物流，1取货点自提，2送货或者自提）
     let head_phone = that.data.user_info.phone; //团长手机号
+    let userName = that.data.user_info.name; //团长名称
     let expected_arrival_time = that.data.pintuandetail.expected_arrival_time; //预计到货时间
     if (shopcart.length > 0) {
       wx.setStorageSync('shopcart', shopcart);
       wx.navigateTo({
-        url: '/pages/confirmorder/confirmorder?id=' + id + '&all_scribe_price=' + all_scribe_price + '&all_price=' + all_price + '&gang_name=' + gang_name + '&logistics_mode=' + logistics_mode + '&head_phone=' + head_phone + '&expected_arrival_time=' + expected_arrival_time,
+        url: '/pages/confirmorder/confirmorder?id=' + id + '&all_scribe_price=' + all_scribe_price + '&all_price=' + all_price + '&gang_name=' + gang_name + '&logistics_mode=' + logistics_mode + '&head_phone=' + head_phone + '&expected_arrival_time=' + expected_arrival_time + '&user_name=' + userName,
       })
     } else {
       wx.showToast({

pages/pintuandetail/pintuandetail.wxml

@@ -20,6 +20,7 @@
     <view class="body-center">
       <view bindtap="gobianji">
         <p>{{user_info.name}}</p>
+        <van-switch class="buttonClass" active-color="#FF874E" checked="{{ !isSubscription }}"  size="20px" bind:change="subscription" />
         <button wx:if="{{!isSubscription}}" catchtap="subscription" style="background-color: #FF874E">
           <p>订阅</p>
         </button>

pages/pintuandetail/pintuandetail.wxss

@@ -92,6 +92,19 @@ page .sell-top .top-body .body-center > view > button {
   position: absolute;
   left: 160rpx;
 }
+page .sell-top .top-body .body-center > view .buttonClass {
+    /* 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: 80rpx;
+}
 page .sell-top .top-body .body-center > view > view {
   width: 108rpx;
   height: 44rpx;
@@ -303,7 +316,7 @@ page .goods-card .goods-card-body .good-card .cover-view {
   font-size: 28rpx;
 }
 page .goods-card .goods-card-body .good-card image {
-  width: 100%;
+  width: 344rpx;
   height: 344rpx;
   border-radius: 27rpx;
 }
@@ -420,7 +433,8 @@ page .goods-card .goods-list-body .goods-item .goods-item-right .goods-item-righ
   justify-content: space-between;
 }
 page .goods-card .goods-list-body .goods-item .goods-item-right .goods-item-right-row2 .goods-item-right-row2-tag {
-  width: 92rpx;
+  /* width: 92rpx; */
+  padding:0 10rpx;
   height: 28rpx;
   border: 2rpx solid #FF874E;
   border-radius: 6rpx;

pages/pintuanmanage/pintuanmanage.js

@@ -14,7 +14,7 @@ Page({
       capsuleMode: 'navBack', //显示模式（navBack：返回上一页；navHome：返回首页）
     },
     tabs: [
-      "全部", "未发布", "已发布", "已截团"
+      "全部","已发布","未发布", "已截团"
     ],
     zhong: 0, //当前tab索引
     icon: {

pages/pintuanmanage/pintuanmanage.wxml

@@ -23,7 +23,7 @@
       <input bindinput="searchGood" value="{{goodName}}" class="ssinput" type="text" placeholder="搜索" placeholder-style="color:#989898;"></input>
     </view>
     <view class="forlate" wx:key="index">
-      <order-card wx:for="{{pintuan}}" cardData="{{item}}" data-id="{{item.id}}" bindtap="navToPinTuanDetail"></order-card>
+      <order-card2 wx:for="{{pintuan}}" cardData="{{item}}" data-id="{{item.id}}" bindtap="navToPinTuanDetail"></order-card2>
     </view>
   </view>
 </view>

pages/search/search.js

@@ -158,6 +158,7 @@ Page({
     })
   },
   inputKeyWords(e) {
+    console.log(e.detail.value)
     if (e.detail.value === '') {
       this.setData({
         keywords: e.detail.value,

pages/search/search.wxml

@@ -4,7 +4,7 @@
 <view class="search">
   <view class="sel-input">
     <view class="sel-body">
-      <input class="sel-b-input" placeholder-style="font-size: 28rpx;color: #989898;" placeholder="请输入团长姓名" type="text" value="{{keywords}}" bindinput="inputKeyWords" />
+      <input class="sel-b-input" bindconfirm="search" placeholder-style="font-size: 28rpx;color: #989898;" placeholder="请输入团长姓名" type="text" value="{{keywords}}" bindinput="inputKeyWords" confirm-type="搜索"/>
       <view class="sel-line"></view>
       <view class="sel-right" bindtap="search">
         <van-icon name="search" style="font-size: 40rpx;margin-left: 28rpx;" />

pages/sharetofirend/sharetofirend.js

@@ -1,4 +1,3 @@
-// pages/sharetofirend/sharetofirend.js
 const app = getApp();
 const api = require('../../api/api');
 Page({
@@ -37,8 +36,8 @@ Page({
       that.getHead_info();
     } else if (that.data.type == 1) {
       // 获取拼团详情分享二维码
-      that.getCode_gang();
     }
+    that.getCode_gang();
   },
 
   /**

pages/sharetofirend/sharetofirend.wxml

@@ -31,7 +31,8 @@
       </view>
     </view>
     <view class="center">
-      <image show-menu-by-longpress src="{{user_info.wechat_code}}"></image>
+      <!-- <image show-menu-by-longpress src="{{user_info.wechat_code}}"></image> -->
+      <image show-menu-by-longpress src="{{pintuan_detail.gang_code}}"></image>
     </view>
     <view class="foot">
       扫一扫或长按识别二维码进入卖家首页

pages/wxqrcode/wxqrcode.js

@@ -27,6 +27,7 @@ Page({
       name: options.name,
       wechat_code: options.wechat_code
     })
+    console.log(options.wechat_code)
   },
 
   /**

project.config.json

@@ -10,7 +10,7 @@
     "include": []
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "es6": true,
     "enhance": true,
     "postcss": false,
@@ -27,7 +27,6 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
@@ -37,22 +36,23 @@
       "outputPath": ""
     },
     "enableEngineNative": false,
+    "bundle": false,
     "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true,
-    "useStaticServer": true
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.19.4",
+  "libVersion": "2.25.2",
   "appid": "wx7ac7aa051ae15245",
   "projectname": "YouTuan_wxapp",
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
   "condition": {
     "search": {
       "list": []
@@ -72,9 +72,5 @@
     "miniprogram": {
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

project.private.config.json

@@ -4,509 +4,453 @@
     "urlCheck": false,
     "useIsolateContext": false
   },
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "libVersion": "2.24.2",
   "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
     "miniprogram": {
       "list": [
         {
           "name": "首页",
           "pathName": "pages/index/index",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "发布",
           "pathName": "pages/publish/publish",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的",
           "pathName": "pages/mine/mine",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-设置",
           "pathName": "pages/setting/setting",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团员-我的订单",
           "pathName": "pages/myorders/myorders",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我的主页",
           "pathName": "pages/myhomepage/myhomepage",
-          "query": "",
-          "launchMode": "default",
+          "query": "type=0&id=12",
           "scene": null
         },
         {
           "name": "我的-团长-我的主页-用户信息",
           "pathName": "pages/userinfo/userinfo",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-提现管理",
           "pathName": "pages/withdraw/withdraw",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-提现管理-收支明细",
           "pathName": "pages/companydetail/companydetail",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "发布-创建新拼团",
           "pathName": "pages/announce/announce",
           "query": "type=add",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团员-我的足迹",
           "pathName": "pages/footprint/footprint",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团员-银行卡管理",
           "pathName": "pages/bankcard/bankcard",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团员-收货地址",
           "pathName": "pages/deliveryaddress/deliveryaddress",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-提现管理-提现记录",
           "pathName": "pages/companyrecord/companyrecord",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-订单管理",
           "pathName": "pages/ordermanage/ordermanage",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-退货管理",
           "pathName": "pages/returnofgoods/returnofgoods",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-统计分析",
           "pathName": "packageA/pages/analysis/analysis",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-商品核销-卡券号核销",
           "pathName": "pages/cardverify/cardverify",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-商品核销-卡券号核销-扫码核销",
           "pathName": "pages/verify/verify",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-收款码",
           "pathName": "pages/receipt/receipt",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "搜索",
           "pathName": "pages/search/search",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-请帮我卖",
           "pathName": "pages/invitehelpmesell/invitehelpmesell",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-提现管理-申请提现-提现申请",
           "pathName": "pages/company/company",
           "query": "id=4",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-提现管理-申请提现-行业选择",
           "pathName": "pages/treadsel/treadsel",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "排名对比（废弃）",
           "pathName": "pages/analysisdetail/analysisdetail",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我的主页-微信二维码",
           "pathName": "pages/wxqrcode/wxqrcode",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团员-银行卡管理-添加银行卡",
           "pathName": "pages/addbankcard/addbankcard",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "日志",
           "pathName": "pages/logs/logs",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "发布-复制往期拼团",
           "pathName": "pages/copypastgroup/copypastgroup",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-统计分析-排名",
           "pathName": "pages/rank/rank",
           "query": "enterType=0&filterType=1&title=买家排名",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我的主页-分享朋友圈",
           "pathName": "pages/sharetofirend/sharetofirend",
           "query": "type=1&id=33",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-管理员管理",
           "pathName": "pages/adminmanage/adminmanage",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-拼团管理",
           "pathName": "pages/pintuanmanage/pintuanmanage",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单详情",
           "pathName": "pages/orderdetail/orderdetail",
           "query": "id=177",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单详情-退款申请",
           "pathName": "pages/requestrefund/requestrefund",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单详情-退款申请-确认退款",
           "pathName": "pages/confirmrefund/confirmrefund",
           "query": "id=11",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我要帮卖",
           "pathName": "pages/helptosell/helptosell",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我的申请-团长详情",
           "pathName": "pages/myapplyfor/myapplyfor",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "退货管理-退款详情",
           "pathName": "pages/returnofdetail/returnofdetail",
           "query": "id=14",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "退款管理-退款处理",
           "pathName": "pages/returnofmoney/returnofmoney",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-我要帮卖-供应大厅&正在帮卖-团长详情",
           "pathName": "pages/tuanzdetail/tuanzdetail",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "发布-创建新拼团-编辑商品-添加商品",
           "pathName": "pages/addtogood/addtogood",
           "query": "enterType=edit&id=42",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "新增/修改提货点",
           "pathName": "pages/adddeliveryaddress/adddeliveryaddress",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "我的-团长-商品核销",
           "pathName": "pages/goodverify/goodverify",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "商品库",
           "pathName": "pages/goodsbank/goodsbank",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "收支明细-拼团",
           "pathName": "pages/companydetailgroup/companydetailgroup",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "收支明细-详情",
           "pathName": "pages/companydetailinfo/companydetailinfo",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "申请提现",
           "pathName": "pages/corporatebanktransfer/corporatebanktransfer",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "新增/修改地址",
           "pathName": "pages/addaddress/addaddress",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "拼团选择",
           "pathName": "pages/pintuanchoose/pintuanchoose",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理-销售统计",
           "pathName": "pages/salestatistics/salestatistics",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理-订单状态",
           "pathName": "pages/orderstatus/orderstatus",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理-导出订单-选择",
           "pathName": "pages/exportorder/exportorder",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理-导出订单",
           "pathName": "pages/exportorderdetail/exportorderdetail",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "卖货团长-正在帮卖-团长详情2",
           "pathName": "pages/tuanzdetail2status/tuanzdetail2status",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "商品库选择",
           "pathName": "pages/goodsbankchoose/goodsbankchoose",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "个人认证-手机号",
           "pathName": "pages/phonenumber/phonenumber",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "个人认证-验证码输入",
           "pathName": "pages/verifycode/verifycode",
           "query": "phone=8615963955623",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "个人认证-认证成功",
           "pathName": "pages/authorizesuccessful/authorizesuccessful",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "发布帮卖-帮卖商品-提交申请-从商品库添加",
           "pathName": "pages/goodsbankselect/goodsbankselect",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订阅团长-拼团详情",
           "pathName": "pages/pintuandetail/pintuandetail",
           "query": "type=dingyue&id=41",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "下单",
           "pathName": "pages/confirmorder/confirmorder",
           "query": "id=25&all_scribe_price=0.5&all_price=1&gang_name=张增威拼团-2022-05-14-01&logistics_mode=2&head_phone=15963955623&expected_arrival_time=2022-06-15 14:28:00",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "提现管理",
           "pathName": "pages/withdraw/withdraw",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "卖货团长-团长详情2",
           "pathName": "pages/tuanzdetail2status2/tuanzdetail2status2",
           "query": "id=8&type=1&uid=5",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理",
           "pathName": "pages/ordermanage/ordermanage",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单管理-订单详情",
           "pathName": "pages/orderstatus/orderstatus",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "订单核销",
           "pathName": "pages/goodverify/goodverify",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "绑定管理员",
           "pathName": "pages/bindadmin/bindadmin",
           "query": "user_id=6&user_name=张增威&user_avatar=http://jianadashequtuangou.oss-us-west-1.aliyuncs.com/image/16522562779675.png",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "切换账号",
           "pathName": "pages/adminlist/adminlist",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "",
           "pathName": "pages/groupdetail/groupdetail",
           "query": "",
-          "launchMode": "default",
           "scene": null
         },
         {
           "name": "退款申请详情",
           "pathName": "pages/confirmrefund/confirmrefund",
           "query": "id=14",
-          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "确认订单",
+          "pathName": "pages/confirmorder/confirmorder",
+          "query": "id=61&all_scribe_price=2&all_price=1&gang_name=7拼团&logistics_mode=1&head_phone=18369588941&expected_arrival_time=&user_name=。",
           "scene": null
         }
       ]
     }
-  },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "2.24.2"
+  }
 }