表问题处理备份

compone/order-card2/order-card2.wxml

@@ -4,6 +4,8 @@
 	<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.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
@@ -18,8 +20,7 @@
 				<van-image round width="50rpx" style="margin-top: 8rpx;" fit="cover" height="50rpx" src="{{cardData.headimg}}" />
 				<p>{{cardData.name}}</p>
 			</view>
-			<!-- <view>发布时间:{{cardData.opening_time}}</view>
-			<view>发布时间:{{cardData.closing_time}}</view> -->
+			
 			<p class="late-c-p" wx:if="{{cardData.gang_status == 1}}">拼团中</p>
 			<p class="late-c-p" wx:else style="color: #989898;">已截团</p>
 		</view>
@@ -45,6 +46,8 @@
 			<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.gang_status == 0}}" stroke-width="8" show-pivot="{{false}}" color="#FF874E" track-color="#FF874E70" />
@@ -59,7 +62,7 @@
 					<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="late1-c-p" wx:else style="color: #989898;">已截团</p>
 			</view>
 		</view>

pages/announce/announce.js

@@ -632,9 +632,9 @@ Page({
     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].commodity_id)
+        console.log(items[i].id)
         console.log(values[j])
-        if (items[i].commodity_id == values[j]) {
+        if (items[i].id == values[j]) {
           items[i].xuan = true
           break
         }
@@ -699,7 +699,7 @@ Page({
     let that = this;
     let arr = that.data.mockData;
     for (let i = 0; i < that.data.checkBoxResult.length; i++) {
-      arr.splice(arr.findIndex(item => item.commodity_id === Number(that.data.checkBoxResult[i])), 1)
+      arr.splice(arr.findIndex(item => item.id === Number(that.data.checkBoxResult[i])), 1)
     }
     // console.log(arr);
     that.setData({

pages/announce/announce.wxml

@@ -164,7 +164,7 @@
     <!-- 商品卡片-非管理模式-end -->
     <!-- 商品卡片-管理模式-start -->
     <van-checkbox-group value="{{ checkBoxResult }}" bind:change="checkBoxChange" wx:if="{{openManageMode}}">
-      <van-checkbox use-icon-slot wx:for="{{mockData}}" name="{{item.commodity_id}}">
+      <van-checkbox use-icon-slot wx:for="{{mockData}}" name="{{item.id}}">
         <view style="position: relative;">
           <view class="good-card" style="width: 574rpx;">
             <view class="good-card-top">
@@ -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/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

@@ -364,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',
@@ -708,7 +708,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/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}}" catchtap="subscription" >
+				<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}}" catchtap="subscription" >
+				<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%;

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/pintuanmanage/pintuanmanage.js

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

project.private.config.json

@@ -51,7 +51,7 @@
         {
           "name": "我的-团长-我的主页",
           "pathName": "pages/myhomepage/myhomepage",
-          "query": "",
+          "query": "type=0&id=12",
           "scene": null
         },
         {