shish hace 1 año
padre
commit
5723c78a59

+ 1 - 1
ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -289,7 +289,7 @@ export default {
 			let newProduct = this.flowersList.map((ele) => {
 				return {id:ele.productId,price:ele.suggestPrice,skPrice:ele.suggestSkPrice,hjPrice:ele.suggestHjPrice}
 			})
-			uni.showLoading({mask:true})
+			uni.showLoading({mask:false})
 			batchChangePrice({data:JSON.stringify(newProduct),changeType:'cg',targetId:targetId,appVersion:1}).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){

+ 1 - 1
hdApp/src/admin/order/detail.vue

@@ -20,7 +20,7 @@
         </view>
       </view>
 
-      <view class="module-com order-msg">
+      <view class="module-com order-msg" v-if="orderInfo.forward == 0">
         <view class="module-tit">
           收花人信息<text v-if="orderInfo.fromType == 4 && !$util.isEmpty(orderInfo.thirdSn)">(美团编号:{{orderInfo.thirdSn}})</text>
           <button class="admin-button-com mini-btn" @click="edit(orderInfo)" v-if="orderInfo.status == 1 || orderInfo.status == 2" style="float:right;">修改</button>

+ 1 - 1
hdApp/src/admin/stat/kindLz.vue

@@ -19,7 +19,7 @@
 							<t-td><view style="color:black;font-size:25upx;">{{item.saleNum}}</view></t-td>
 						</t-tr>
 						<t-tr>
-							<t-td><view style="text-align:right;font-size:30upx;">采购 {{profit.cgTotalNum}},销售 {{profit.saleTotalNum}}</view></t-td>
+							<t-td><view style="text-align:right;font-size:30upx;">采购 {{profit.cgTotalNum||0}},销售 {{profit.saleTotalNum||0}}</view></t-td>
 						</t-tr>
 
 					</t-table>