06212022表修改

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.wxml

@@ -8,10 +8,10 @@
 		<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" />
+			<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>
 		<!-- 用户信息 -->
@@ -21,7 +21,8 @@
 				<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>
 		<!-- 商品图片 -->
@@ -50,10 +51,10 @@
 			<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" />
+				<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>
 			<!-- 用户信息 -->
@@ -63,6 +64,7 @@
 					<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>

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

@@ -692,6 +692,11 @@ Page({
   // 输入备注
   inputRemarks(e) {
     this.setData({
+      remarks: e.detail.value
+    })
+  },
+  inputRemarksPhone(e) {
+    this.setData({
       editFormPhone: e.detail.value
     })
   },

pages/confirmorder/confirmorder.wxml

@@ -139,9 +139,9 @@
   </view>
   <!-- 备注信息 -->
   <view class="remark-info">
-    <view class="remarkText">预留电话</view>
-    <input type="number" value="{{editFormPhone}}" bindinput="inputRemarks" placeholder="点此输入" placeholder-class="placeholder" />
-    <!-- <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>
 <!-- 底部栏-下单 -->

pages/myhomepage/myhomepage.wxml

@@ -21,11 +21,11 @@
 				<!-- 订阅团长 -->
 				<view></view>
 				
-				<view class="btn" wx:if="{{enterType === 0 && !isSubscription}}" catchtap="subscription" >
+				<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}}" catchtap="subscription" >
+				<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 >

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: '截止拼团'
@@ -964,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,

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;