shish 5 سال پیش
والد
کامیت
026b199ddf

+ 1 - 1
ghsApp/src/pagesArrears/list.vue

@@ -111,7 +111,7 @@ export default {
 		},
 		callUp(mobile) {
 			uni.makePhoneCall({
-				phoneNumber: mobile //仅为示例
+				phoneNumber: mobile
 			});
 		},
 	}

+ 4 - 12
ghsApp/src/pagesOrder/detail.vue

@@ -1,9 +1,5 @@
 <template>
 	<view class="app-content">
-<!--		<stepStatus-->
-<!--			v-if="!$util.isEmpty(detailInfo)"-->
-<!--			:stepOptions="detailInfo.progress"-->
-<!--		></stepStatus>-->
 		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
 			<view class="title">
 				客户
@@ -85,7 +81,7 @@
 							:key="idx"
 							class="commodity-item"
 						>
-							<image class="item-icon" :src="s.cover" alt="商品图片" />
+							<image class="item-icon" :src="s.cover" alt="" />
 
 							<view class="item-info">
 								<view class="info-line">
@@ -106,8 +102,7 @@
 					<view class="summary-bar">
 						<view class="operate-view" ></view>
 						<view class="describe-view">
-							共{{ detailInfo.productStat.kind || 0 }}种, 共{{ detailInfo.productStat.bigNum }}扎{{
-								detailInfo.productStat.smallNun}}支,合计 ¥<text class="price">{{ detailInfo.productStat.totalPrice }}</text>
+							共{{ detailInfo.productStat.kind}}种, 共{{ detailInfo.productStat.bigNum }}扎{{detailInfo.productStat.smallNun}}支,合计 ¥<text class="price">{{ detailInfo.productStat.totalPrice }}</text>
 						</view>
 					</view>
 				</view>
@@ -120,7 +115,7 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">总金额</div>
-						<div class="detail-price_box red">¥{{ detailInfo.totalPrice || 0 }}</div>
+						<div class="detail-price_box red">¥{{ detailInfo.actPrice}}</div>
 					</tui-list-cell>
 				</div>
 			</view>
@@ -248,8 +243,6 @@ export default {
 						}
 					}
 				});
-
-				// this.pageTo({url: "/pagesOrder/ship",query: {id: item.id}});
 			}else if (s.type === "hasPay") {
 				let self = this;
 				//已收款
@@ -264,7 +257,6 @@ export default {
 						}
 					}
 				});
-				// this.pageTo({url: "/pagesOrder/ship",query: {id: item.id}});
 			}
 		},
 		copy(val) {
@@ -278,7 +270,7 @@ export default {
 		},
 		callUp(mobile) {
 			uni.makePhoneCall({
-				phoneNumber: mobile //仅为示例
+				phoneNumber: mobile
 			});
 		},
 		async init() {

+ 3 - 4
hdApp/src/admin/billing/affirmGhs.vue

@@ -258,7 +258,7 @@
 					<text class="large" v-else>{{ allPrice}}</text>
 				</text>
 			</view>
-			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
+			<button class="admin-button-com blue middle" @click="affirmFormSubmit">提交</button>
 		</view>
 		<!-- 选择客户 -->
 <!--		<AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" />-->
@@ -355,7 +355,7 @@ export default {
     },
 		toPhone(phone){
 			uni.makePhoneCall({
-				phoneNumber: phone //仅为示例
+				phoneNumber: phone
 			});
 		},
 		getGhsData(id) {
@@ -415,7 +415,6 @@ export default {
 			});
 		},
 		affirmFormSubmit(){
-			// if(this.sendTime==''){uni.showToast({title:'请先选择时间',icon:'none'});return}
 			const product = this.selectList.map(ele => {
 				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
 			});
@@ -430,7 +429,7 @@ export default {
 			let self = this;
 			uni.showModal({
 				title: '提示',
-				content: '确认下单?',
+				content: '确认提交?',
 				success: function (res) {
 					if (res.confirm) {
 						createOrder(parameter).then(res => {

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

@@ -407,7 +407,7 @@ export default {
   methods: {
     callUp(phone) {
       uni.makePhoneCall({
-        phoneNumber: phone //仅为示例
+        phoneNumber: phone
       });
     },
     //设置客户标签

+ 1 - 1
hdApp/src/pagesArrears/list.vue

@@ -110,7 +110,7 @@ export default {
 		},
 		callUp(mobile) {
 			uni.makePhoneCall({
-				phoneNumber: mobile //仅为示例
+				phoneNumber: mobile
 			});
 		},
 	}

+ 1 - 1
hdApp/src/pagesClient/member/detail.vue

@@ -177,7 +177,7 @@ export default {
     },
     callUp() {
       uni.makePhoneCall({
-        phoneNumber: this.userInfo.mobile //仅为示例
+        phoneNumber: this.userInfo.mobile
       });
     },
     init() {

+ 1 - 1
hdApp/src/pagesOrder/detail.vue

@@ -275,7 +275,7 @@ export default {
 		},
 		callUp(mobile) {
 			uni.makePhoneCall({
-				phoneNumber: mobile //仅为示例
+				phoneNumber: mobile
 			});
 		},
 		async init() {

+ 1 - 1
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -238,7 +238,7 @@ export default {
     // 拨打电话  wangn  2021-5-6
     toPhone(phone){
 			uni.makePhoneCall({
-				phoneNumber: phone //仅为示例
+				phoneNumber: phone
 			});
 		},
 		modalCancel() {

+ 3 - 1
hdApp/src/pagesPurchase/orderItem.vue

@@ -71,7 +71,9 @@ export default {
         case '4':
           statusName = "已完成";
           break;
-
+        case '5':
+          statusName = "已取消";
+          break;
         default:
           break;
       }