预订单

ghsApp/src/admin/home/apply.vue

@@ -54,7 +54,7 @@ export default {
                     title:'订单与销售',
                     list:[
                         {name: "预订单",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/order/statBook"},
-                        {name: "预订设置",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/order/bookSet"},
+                        {name: "预订单设置",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/order/bookSet"},
                     ]
                 },
                 {

ghsApp/src/admin/home/member.vue

@@ -20,9 +20,6 @@
               </div>
               <div class="tui-msg-content">
                 <span>{{ item.visitTime.substr(5,11) }}</span>
-                <span style="margin-left:50upx;width:60upx;font-weight:500">
-                  <text>{{ item.levelName }}</text>
-                </span>
                 <span v-if="tabIndex == 1" class="debt-amount">消费 <span class="amount_num">{{parseFloat(item.buyAmount)}}</span> </span>
                 <span v-else>
                   <span v-if="item.debtAmount>0" class="debt-amount">

ghsApp/src/api/shop/index.js

@@ -91,7 +91,7 @@ export const updateCgModel = data => {
 	return https.get('/shop/update-cg-model', data)
 }
 
-//预订设置
+//预订单设置
 export const bookSet = data => {
 	return https.get('/shop/book-set', data)
 }

ghsApp/src/pages.json

@@ -359,7 +359,7 @@
 			"root": "admin/order",
 			"pages": [
 				{"path": "itemOrder","style": {"navigationBarTitleText": "订单列表"}},
-				{"path": "bookSet","style": {"navigationBarTitleText": "预订设置"}},
+				{"path": "bookSet","style": {"navigationBarTitleText": "预订单设置"}},
 				{"path": "statBook","style": {"navigationBarTitleText": "预订单"}},
 				{"path": "statKhBook","style": {"navigationBarTitleText": "详情"}}
 			]

ghsApp/src/pagesPurchase/info.vue

@@ -57,8 +57,7 @@
 				<view>结算状态：</view>
 					<view style="color:red;">欠款</view>
 					<view class="price">
-					<text v-if="detailInfo.debtAmount > 0" @click="goToClear(detailInfo)" style="margin-right:38upx;color:#3385FF;font-size:26upx;">全部欠款单</text>
-					<button @click="clearOrder(detailInfo)" class="admin-button-com">结清本单</button>
+					<button @click="goToClear(detailInfo)" class="admin-button-com">全部欠款单</button>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>
@@ -353,32 +352,6 @@ export default {
 
 			return data;
 		},
-		//咨询是否结账
-		clearOrder(item){
-			let that = this
-			that.$util.confirmModal({content:'确定结账？'},() => {
-				that.doClearOrder(item)
-			})
-		},
-		//结账
-		doClearOrder(item) {
-			let that = this
-			let id = item.id
-			let ghsId = item.ghsId
-			let actPrice = item.actPrice
-			let paramData = {
-				id:JSON.stringify([{id:id}]),
-				ghsId:ghsId,
-				modifyPrice:actPrice
-			}
-			clearOrderApi(paramData).then(res => {
-				if(res.code == 1) {
-					that.pageTo({url: '/common/success',type: 2,query:{titleType:2}})
-				}
-			}).catch(err => {
-				console.log('err', err)
-			})
-		},
 		goToClear (item) {
 			this.pageTo({
 				url: '/pagesGys/details?id='+item.ghsId

hdApp/src/pagesPurchase/bookExplain.vue

@@ -11,7 +11,7 @@
         <view>下单时按下单当天销售价付款，到货后按到货当天进货价结算，多退少补</view>
         <view>门店仅收取服务费，每公斤服务费{{parseFloat(kiloFee)}}元，不足{{parseFloat(miniKilo)}}公斤按{{parseFloat(miniKilo)}}公斤计算</view>
         <view>当天15点前下单，第二天送达，15点后下单的，第三天送达</view>
-        <view>预订下单成功后暂不支持取消</view>
+        <view>预订下单成功后暂不可取消</view>
       </view>
       <view style="text-align:center;">
         <button style="margin:10upx auto;padding-left:50upx;padding-right:50upx;" class="admin-button-com blue middle" @click="goBack()">返回</button>

hdApp/src/pagesPurchase/purDetails.vue

@@ -80,7 +80,7 @@
           <view>欠款状态：</view>
             <view>是</view>
             <view class="price">
-              <button v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" class="admin-button-com">全部欠款单</button>
+              <button @click="goToSettle(detailInfo)" class="admin-button-com">全部欠款单</button>
             </view>
         </view>
         <view class="order-info_box" v-else>