修改团购倒计时的问题

assets/css/style.less

@@ -5077,11 +5077,13 @@ page {
 }
 
 .product-con .assemble .item .pictxt {
-  width: 2.95*100rpx;
+  flex:1;
 }
 
 .product-con .assemble .item .pictxt .text {
-  width: 1.94*100rpx;
+  flex:1;
+  font-size: 0.24*100rpx;
+  padding-left:15rpx
 }
 
 .product-con .assemble .item .pictxt .pictrue {

pages/activity/GroupDetails/index.vue

@@ -65,8 +65,8 @@
                 <text class="font-color-red" v-text="item.count"></text>
                 <text>人成团</text>
               </view>
-              <count-down :isDay="false" :tipText="'剩余 '" :dayText="false" :hourText="':'" :minuteText="':'"
-                :secondText="false" :datatime="item.stopTime/1000"></count-down>
+              <count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '"
+            :secondText="' '" :datatime="item.stopTime/1000"></count-down>
             </view>
             <view class="spellBnt" @click="groupRule(item.id)">
               去拼单

pages/orderAdmin/OrderCancellation/index.vue

@@ -7,13 +7,14 @@
 			<view class="input">
 				<input type="number" placeholder="0" v-model="verify_code" />
 			</view>
-			<view class="bnt" @click="storeCancellation">立即核销</view>
-		</view>
+			<view class="bnt" @click="storeCancellation">立即核销</view>
+			<view class="bnt" @click="openQRCode">扫码核销</view>
+		</view>
 		<!-- #ifndef H5 -->
-		<view class="scan" v-if="iswechat">
+		<!-- <view class="scan" v-if="iswechat">
 			<image src="@/static/images/scan.gif" @click="openQRCode" />
-		</view>
-		<!-- #endif -->
+		</view> -->
+		<!-- #endif -->
 		<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
 	</view>
 </template>
@@ -196,4 +197,4 @@
 		height: 100%;
 		display: block;
 	}
-</style>
+</style>