Merge branch 'master' into debt

.gitignore

@@ -1,3 +1,4 @@
 .idea
 .DS_Store
-hdApp/dist/release/
+hdApp/dist/release/
+package-lock.json

ghsApp/src/admin/custom/set.vue

@@ -2,41 +2,36 @@
 	<view class="app-content">
 		<form @submit="toSubmit">
 			<view class="module-com input-line-wrap">
+
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">客户可看库存</view>
+					<view class="tui-title">新客享受价格</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '允许' : '不能'}}
+						<button class="admin-button-com middle" :class="[form.isHd == 1 ? 'blue' : 'default']" @click="form.isHd = 1">批发价</button>
+						<button class="admin-button-com middle" :class="[form.isHd == 0 ? 'blue' : 'default']" @click="form.isHd = 0" style="margin-left:8upx;">零售价</button>
 					</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">新客享受价格</view>
-					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.isHd == 1 ? false : true" @change="isHdChange" /> {{form.isHd == 1 ? '批发价' : '零售价'}}
-					</view>
+					<view class="tui-title ">新客授信额度</view>
+					<input type="number" v-model="form.allowDebtAmount" @focus="form.allowDebtAmount=''" placeholder-class="phcolor" class="tui-input" name="allowDebtAmount" placeholder="请填写金额" />
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">新客允许欠款</view>
+					<view class="tui-title">新客自助挂账</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '不能' : '允许'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '禁止' : '允许'}}
 					</view>
 				</tui-list-cell>
 
-				<tui-list-cell class="line-cell" :hover="false" v-if="form.allowDebt == 1">
-					<view class="tui-title ">新客授信额度</view>
-					<input type="number" v-model="form.allowDebtAmount" @focus="form.allowDebtAmount=''" placeholder-class="phcolor" class="tui-input" name="allowDebtAmount" placeholder="请填写金额" />
-				</tui-list-cell>
-
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">线下开单超欠</view>
+					<view class="tui-title">新客查看库存</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.overAllowDebt == 0 ? false : true" @change="overAllowDebtChange" /> {{form.overAllowDebt==1 ? '可以' : '不要'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '允许' : '禁止'}}
 					</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">新客户要审核</view>
+					<view class="tui-title">新客注册审核</view>
 					<view>
 						<switch style="transform:scale(0.7,0.7)" :checked="form.needCheck == 0 ? false : true" @change="needCheckChange" /> {{form.needCheck==0 ? '不要' : '需要'}}
 					</view>
@@ -45,22 +40,22 @@
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">新客送货上门</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.home == 0 ? false : true" @change="homeChange" /> {{form.home==1 ? '是' : '否'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.home == 0 ? false : true" @change="homeChange" /> {{form.home==1 ? '支持' : '不支持'}}
 					</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
 					<view class="tui-title">上门最低消费</view>
-					<button class="admin-button-com mini-btn" :class="[form.homeType == 0 ? 'blue' : 'default']" @click="form.homeType=0">金额</button>
-					<button class="admin-button-com mini-btn" :class="[form.homeType == 1 ? 'blue' : 'default']" @click="form.homeType=1" style="margin-left:8upx;">扎数</button>
+					<button class="admin-button-com middle" :class="[form.homeType == 0 ? 'blue' : 'default']" @click="form.homeType=0">金额</button>
+					<button class="admin-button-com middle" :class="[form.homeType == 1 ? 'blue' : 'default']" @click="form.homeType=1" style="margin-left:8upx;">扎数</button>
 					<input v-model="form.homeAmount" placeholder-class="phcolor" @focus="form.homeAmount=''" class="tui-input" name="homeAmount" placeholder="输数值，没门槛填0" type="digit"
-					style="width:38%;border:1upx solid #ddd;margin-left:8upx;height:52upx;text-align:center;" />
+					style="width:37%;border:1upx solid #ddd;margin-left:8upx;height:70upx;text-align:center;" />
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">客户可看销量</view>
+					<view class="tui-title">客户查看销量</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.showSold == 0 ? false : true" @change="showSoldChange" /> {{form.showSold==1 ? '可以' : '不要'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.showSold == 0 ? false : true" @change="showSoldChange" /> {{form.showSold==1 ? '可以' : '禁止'}}
 					</view>
 				</tui-list-cell>
 
@@ -97,7 +92,6 @@ export default {
 				allowDebtAmount:5000,
 				showStock:1,
 				showSold:0,
-				overAllowDebt:1,
 				isHd:1
 			}
 		}
@@ -128,9 +122,6 @@ export default {
 		showStockChange(e){
 			this.form.showStock = e.target.value ? 1 : 0
 		},
-		overAllowDebtChange(e){
-			this.form.overAllowDebt = e.target.value ? 1 : 0
-		},
 		showSoldChange(e){
 			this.form.showSold = e.target.value ? 1 : 0
 		},

ghsApp/src/admin/shop/add.vue

@@ -182,13 +182,6 @@
 					</view>
 				</tui-list-cell>
 
-				<!-- <tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">线下开单超欠</view>
-					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.overAllowDebt == 0 ? false : true" @change="overAllowDebtChange" /> {{form.overAllowDebt==1 ? '允许' : '禁止'}}
-					</view>
-				</tui-list-cell> -->
-
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title " style="color:#3385FF;">整单满扎数</view>
 					<input v-model="form.meetNum" style="color:#3385FF;" @focus="form.meetNum=''" placeholder-class="phcolor" class="tui-input" name="meetNum" placeholder="多少扎" type="digit" />
@@ -298,7 +291,6 @@ export default {
 				saleHour:12,
 				pfLevel:0,
 				cgUnitType:0,
-				overAllowDebt:1,
 				isHd:1,
 				itemToClass:0
 			},
@@ -376,9 +368,6 @@ export default {
 		showStockChange(e){
 			this.form.showStock = e.target.value ? 1 : 0
 		},
-		overAllowDebtChange(e){
-			this.form.overAllowDebt = e.target.value ? 1 : 0
-		},
 		cgUnitTypeChange(e){
 			this.form.cgUnitType = e.target.value ? 1 : 0
 		},

ghsApp/src/admin/staff/list.vue

@@ -22,9 +22,10 @@
 							<div class="list-det-left">
 								<div>
 									<span class="staff-name">{{ item.name }}</span>
-									<span> {{ item.id }}</span>
 								</div>
-								<div>{{ item.mobile }}</div>
+								<div>
+									{{ item.mobile }} <text style="margin-left:15upx;" @click.stop="setSuper(item)">{{ item.id }} - {{ item.adminId }}</text>
+								</div>
 								<div class="flex-center">
 									<div class="status-list">
 										<i class="iconfont icondagou" :class="[item.remind == 1 ? 'app-color-1' : '' ]"></i>
@@ -119,7 +120,7 @@ import ModalModule from '@/components/plugin/modal'
 import AppSearchModule from "@/components/module/app-search";
 import { list } from '@/mixins'
 import { mapGetters } from "vuex"
-import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
+import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList,setManager } from '@/api/staff'
 export default {
 	name: 'list',
 	components: {
@@ -181,6 +182,17 @@ export default {
 		}
 	},
 	methods: {
+		setSuper(item){
+			this.$util.confirmModal({content:'确认操作？'},() => {
+				setManager({id:item.id}).then(res=>{
+					if(res.code == 1){
+						this.$msg(res.msg)
+						this.resetList()
+						this.getStaffList()
+					}
+				})
+			})
+		},
 		async init() {
 			this.getStaffList()
 		},
@@ -330,7 +342,7 @@ export default {
 					overflow: hidden;
 					text-overflow:ellipsis;
 					white-space: nowrap;
-					width:180upx;
+					width:220upx;
 				}
 				.super-class{
 					background-color: #3385FF;
@@ -354,7 +366,6 @@ export default {
 						margin-left: 0;
 					}
 					.iconfont {
-						// color: $fontColor3;
 						font-size: 24upx;
 						margin-right: 10upx;
 					}

ghsApp/src/api/staff/index.js

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const setManager = data => {
+	return https.get('/shop-admin/set-manager', data)
+}
+
 /** *
  * 员工列表 b
  */

ghsApp/src/pagesClient/member/detail.vue

@@ -54,12 +54,12 @@
       <view class="module-com user-address_bx">
           <view class="address-tit" style="position: relative;">
             地址 
-              <button class="admin-button-com mini-btn blue" @click="downloadCode()" style="position:absolute;right:200upx;top:-6upx;font-size:29upx;">下载收款码</button>
+              <button class="admin-button-com middle blue" @click="downloadCode()" style="position:absolute;right:200upx;top:-15upx;font-size:29upx;">下载收款码</button>
               <!-- #ifdef MP-WEIXIN -->
-              <button class="admin-button-com mini-btn blue" open-type="share" style="position: absolute;right:16upx;top:-6upx;font-size:29upx;">邀请结账</button>
+              <button class="admin-button-com middle blue" open-type="share" style="position: absolute;right:16upx;top:-15upx;font-size:29upx;">邀请结账</button>
               <!-- #endif -->
               <!-- #ifdef APP-PLUS -->
-              <button class="admin-button-com mini-btn blue" @click="inviteToPay()" style="position: absolute;right:16upx;top:-6upx;font-size:29upx;">邀请结账</button>
+              <button class="admin-button-com middle blue" @click="inviteToPay()" style="position: absolute;right:16upx;top:-15upx;font-size:29upx;">邀请结账</button>
               <!-- #endif -->
           </view>
           <view class="address-des_bx">
@@ -118,7 +118,7 @@
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">线上赊账</div>
+              <div class="tui-title">线上自助挂账</div>
               <div class="switch_bx">
                 <text v-if="form.debt == 0">禁止</text>
                 <text v-else>允许</text>
@@ -128,13 +128,15 @@
 
 						<tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">授信额度</div>
-              <input v-model="debtLimit" @click="debtLimit=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="digit" style="width:48%;border:1upx solid #ddd;margin-right:15upx;height:52upx;text-align:center;" />
-              <button class="admin-button-com blue mini-btn" @tap="amendMoney">确定</button>
+              <input v-model="debtLimit" @click="debtLimit=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="digit" style="width:47%;border:1upx solid #ddd;margin-right:12upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="amendMoney">确定</button>
 						</tui-list-cell>
 
-            <tui-list-cell class="line-cell" :hover="true" :arrow="true" @click="changeLevelPrice()">
+            <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">享受价格</div>
-              <view class="tui-input" style="text-align:center;">{{ form.level == 0 ? '零售价':form.level == 1 ? '批发价':form.level == 2 ? '大客价':'-' }}</view>
+              <button class="admin-button-com middle" :class="[form.level == 0 ? 'blue' : 'default']" @click="changeLevelBtn(0)">零售价</button>
+              <button class="admin-button-com middle" :class="[form.level == 1 ? 'blue' : 'default']" @click="changeLevelBtn(1)" style="margin-left:15upx;margin-right:15upx;">批发价</button>
+              <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)">大客价</button>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
@@ -157,10 +159,10 @@
 
             <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">
               <div class="tui-title">上门最低消费</div>
-              <button class="admin-button-com mini-btn" :class="[userInfo.homeType == 0 ? 'blue' : 'default']" @click="userInfo.homeType=0">金额</button>
-              <button class="admin-button-com mini-btn" :class="[userInfo.homeType == 1 ? 'blue' : 'default']" @click="userInfo.homeType=1" style="margin-left:6upx;margin-right:6upx;">扎数</button>
-              <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限填0" type="digit" style="width:100upx;border:1upx solid #ddd;margin-right:6upx;height:52upx;text-align:center;" />
-              <button class="admin-button-com blue mini-btn" @tap="changeHomeAmount">确定</button>
+              <button class="admin-button-com middle" :class="[userInfo.homeType == 0 ? 'blue' : 'default']" @click="userInfo.homeType=0">金额</button>
+              <button class="admin-button-com middle" :class="[userInfo.homeType == 1 ? 'blue' : 'default']" @click="userInfo.homeType=1" style="margin-left:5upx;margin-right:5upx;">扎数</button>
+              <input v-model="userInfo.homeAmount" @click="userInfo.homeAmount=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="不限填0" type="digit" style="width:100upx;border:1upx solid #ddd;margin-right:5upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="changeHomeAmount">确定</button>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
@@ -183,21 +185,21 @@
 
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">短名称</div>
-              <input v-model="userInfo.shortName" @click="userInfo.shortName=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="text" style="width:48%;border:1upx solid #ddd;margin-right:15upx;height:52upx;text-align:center;" />
-              <button class="admin-button-com blue mini-btn" @tap="changeShortName">确定</button>
+              <input v-model="userInfo.shortName" @click="userInfo.shortName=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="text" style="width:48%;border:1upx solid #ddd;margin-right:12upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="changeShortName">确定</button>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">配送物流</div>
-              <input v-model="userInfo.wlName" @click="userInfo.wlName=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="text" style="width:48%;border:1upx solid #ddd;margin-right:15upx;height:52upx;text-align:center;" />
-              <button class="admin-button-com blue mini-btn" @tap="changeWlFn">确定</button>
+              <input v-model="userInfo.wlName" @click="userInfo.wlName=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="text" style="width:48%;border:1upx solid #ddd;margin-right:12upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="changeWlFn">确定</button>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">货位号</div>
-              <input v-model="userInfo.seatSn" @click="userInfo.seatSn=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="number" style="width:22%;border:1upx solid #ddd;margin-right:15upx;height:52upx;text-align:center;" />
-              <button class="admin-button-com blue mini-btn" @tap="modifySeatSn">修改</button>
-              <button class="admin-button-com blue mini-btn" @tap="createSeatSn" style="margin-left:10upx;">自动生成</button>
+              <input v-model="userInfo.seatSn" @click="userInfo.seatSn=''" placeholder-class="phcolor" class="tui-input" confirm-type="go" placeholder="请填写" type="number" style="width:22%;border:1upx solid #ddd;margin-right:12upx;height:70upx;text-align:center;" />
+              <button class="admin-button-com blue middle" @tap="modifySeatSn">修改</button>
+              <button class="admin-button-com blue middle" @tap="createSeatSn" style="margin-left:10upx;">自动生成</button>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="true" :arrow="true" @click="changeIntroducer()">
@@ -434,19 +436,15 @@ export default {
     changeIntroducer(){
 
     },
-    changeLevelPrice(){
-			const that = this;
-			uni.showActionSheet({
-				itemList: ['零售价', '批发价', '大客价'],
-				success: e => {
-          changeLevel({customId:that.userInfo.id,level:e.tapIndex}).then(res=>{
-            if(res.code == 1){
-              that.form.level = e.tapIndex
-              that.$msg(res.msg)
-            }
-          })
-				}
-			})
+    changeLevelBtn(level) {
+      const that = this;
+      if (this.form.level === level) return;
+      changeLevel({ customId: that.userInfo.id, level }).then(res => {
+        if (res.code == 1) {
+          that.form.level = level;
+          that.$msg(res.msg);
+        }
+      });
     },
     modifySeatSn(){
       if(this.$util.isEmpty(this.userInfo.seatSn)){

ghsApp/src/pagesOrder/detail.vue

@@ -164,7 +164,7 @@
 					</view>
 				</view>
 
-				<view style="border:1upx solid green;width:97%;margin-left:6upx;color:green;padding:2upx;border-radius: 8upx;">
+				<view style="border:1upx solid green;width:97%;margin-left:6upx;color:green;padding:2upx;border-radius: 8upx;" v-if="!$util.isEmpty(trackList)">
 					<view v-for="(name, tIndex) in trackList" :key="tIndex">
 					{{ tIndex+1 }}、{{ name }}
 					</view>

hdApp/src/admin/staff/list.vue

@@ -12,12 +12,14 @@
 							<div class="list-det-left">
 								<div>
 									<span class="staff-name">{{ item.name }}</span>
-									<span>{{ item.mobile }}</span>
+								</div>
+								<div>
+									{{ item.mobile }} <text style="margin-left:15upx;" @click.stop="setSuper(item)">{{ item.id }} - {{ item.adminId }}</text>
 								</div>
 								<div class="flex-center">
 									<div class="status-list">
 										<i class="iconfont icondagou" :class="[item.remind == 1 ? 'app-color-1' : '' ]"></i>
-										<span :class="[item.remind == 1 ? 'app-color-1' : 'app-color-3' ]">收款通知</span>
+										<span :class="[item.remind == 1 ? 'app-color-1' : 'app-color-3' ]">新订单通知</span>
 									</div>
 
 									<div class="status-list">
@@ -115,7 +117,7 @@ import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import ModalModule from '@/components/plugin/modal'
 import { list } from '@/mixins'
 import { mapGetters } from "vuex"
-import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
+import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList,setManager } from '@/api/staff'
 export default {
 	name: 'list',
 	components: {
@@ -167,6 +169,17 @@ export default {
 	},
 	onLoad: function() {},
 	methods: {
+		setSuper(item){
+			this.$util.confirmModal({content:'确认操作？'},() => {
+				setManager({id:item.id}).then(res=>{
+					if(res.code == 1){
+						this.$msg(res.msg)
+						this.resetList()
+						this.getStaffList()
+					}
+				})
+			})
+		},
 		async init() {
 			this.getStaffList()
 		},
@@ -278,9 +291,14 @@ export default {
 				position:relative;
 				.staff-name {
 					color: #333;
-					font-size: 30upx;
+					font-size:30upx;
 					font-weight: 600;
 					margin-right: 10upx;
+					display: inline-block;
+					overflow: hidden;
+					text-overflow:ellipsis;
+					white-space: nowrap;
+					width:220upx;
 				}
 				.super-class{
 					background-color: #3385FF;
@@ -304,7 +322,6 @@ export default {
 						margin-left: 0;
 					}
 					.iconfont {
-						// color: $fontColor3;
 						font-size: 24upx;
 						margin-right: 10upx;
 					}

hdApp/src/api/shop-admin/index.js

@@ -4,6 +4,10 @@ export const closeRemindChange = data => {
 	return https.post('/shop-admin/close-remind-change', data)
 }
 
+export const setManager = data => {
+	return https.get('/shop-admin/set-manager', data)
+}
+
 /** *
  * 准备创建管理员的数据
  */

hdApp/src/api/staff/index.js

@@ -1,7 +1,11 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const setManager = data => {
+	return https.get('/shop-admin/set-manager', data)
+}
+
 /** *
- * 员工列表 b
+ * 员工列表
  */
 export const getStaffList = data => {
 	return https.get('/shop-admin/list', data)

hdApp/src/pagesPurchase/confirmTake.vue

@@ -170,31 +170,31 @@ export default {
 		},
 		commitChange(doType){
 			let that = this
-      if(doType != 1){
-        let hasError = false
-        let errorHint = ''
-        this.flowersList.forEach(function(item){
-          if(that.$util.isMoney(item.suggestPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 批发价'
-            hasError = true
-          }
-          if(that.$util.isMoney(item.suggestSkPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 零售价'
-            hasError = true
-          }
-          if(that.$util.isMoney(item.suggestHjPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 大客价'
-            hasError = true
-          }
-        })
-        if(hasError){
-          this.$msg(errorHint)
-          return false
-        }
-      }
+			if(doType != 1){
+				let hasError = false
+				let errorHint = ''
+				this.flowersList.forEach(function(item){
+				if(that.$util.isMoney(item.suggestPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 批发价'
+					hasError = true
+				}
+				if(that.$util.isMoney(item.suggestSkPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 零售价'
+					hasError = true
+				}
+				if(that.$util.isMoney(item.suggestHjPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 大客价'
+					hasError = true
+				}
+				})
+				if(hasError){
+				this.$msg(errorHint)
+				return false
+				}
+			}
 			let hint = '确认提交？'
 			if(doType == 1){
 				hint = '确认仅入库不改价？'

hdApp/src/pagesPurchase/purDetails.vue

@@ -33,7 +33,7 @@
 						<button @click="copyWl(detailInfo.fhWlNo)" class="admin-button-com default">复制单号</button>
 					</view>
         </view>
-        <view style="border:1upx solid green;width:97%;margin-left:6upx;color:green;padding:2upx;border-radius: 8upx;">
+        <view style="border:1upx solid green;width:97%;margin-left:6upx;color:green;padding:2upx;border-radius: 8upx;" v-if="!$util.isEmpty(trackList)">
           <view v-for="(name, tIndex) in trackList" :key="tIndex">
            {{ tIndex+1 }}、{{ name }}
           </view>