结账

ghsApp/src/admin/clear/customInfo.vue

@@ -157,15 +157,15 @@ export default {
 						let currentIndex = respond.tapIndex
 						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
 						if(currentIndex > 0){
-							payWay = inWay[currentIndex].id
+							let payWay = inWay[currentIndex].id
 							confirmClear({id:info.id,payWay:payWay}).then(res=>{
 								if(res.code == 1){
-									this.$msg('操作成功')
-									this.init()
+									that.$msg('操作成功')
+									that.init()
 								}
 							})
 						}else{
-							this.$msg("请选择收款方式");
+							that.$msg("请选择收款方式");
 						}
 					}
 				})

ghsApp/src/pagesArrears/clearResult.vue

@@ -39,14 +39,14 @@ export default {
 						let currentIndex = respond.tapIndex
 						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
 						if(currentIndex > 0){
-							payWay = inWay[currentIndex].id
-							confirmClear({id:this.option.id,payWay:payWay}).then(res=>{
+							let payWay = inWay[currentIndex].id
+							confirmClear({id:that.option.id,payWay:payWay}).then(res=>{
 								if(res.code == 1){
-									this.$msg('操作成功')
+									that.$msg('操作成功')
 								}
 							})							
 						}else{
-							this.$msg("请选择收款方式");
+							that.$msg("请选择收款方式");
 						}
 					}
 				})

ghsApp/src/pagesClient/member/detail.vue

@@ -53,7 +53,7 @@
             </view>
             <view>
               <i @click="callUp" class="iconfont icondianhua1"></i>
-              <i @click.stop="navigate(userInfo.lat,userInfo.long,userInfo.customName)" class="iconfont icondianhua" style="font-size:47upx;margin-left:35upx;margin-right:18upx;color:#3385ff;"></i>
+              <i @click.stop="navigate(userInfo.lat,userInfo.long,userInfo.customName)" class="iconfont icondianhua" style="font-size:47upx;margin-left:60upx;margin-right:18upx;color:#3385ff;"></i>
             </view>
           </view>
       </view>
@@ -69,18 +69,23 @@
 
       <view class="module-com user-open_bx">
         <view class="input-line-wrap">
-            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
-              <div class="tui-title">待结订单</div>
+
+            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="$msg('开发中')">
+              <div class="tui-title">下单记录</div>
             </tui-list-cell>
 
-            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/custom/debtChange',query: {customId: userInfo.id}})">
-              <div class="tui-title">欠款变动明细</div>
+            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
+              <div class="tui-title">待结订单</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">
               <div class="tui-title">结账单</div>
             </tui-list-cell>
 
+            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/custom/debtChange',query: {customId: userInfo.id}})">
+              <div class="tui-title">欠款变动明细</div>
+            </tui-list-cell>
+
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">欠款开关</div>
               <div class="switch_bx">
@@ -96,7 +101,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></text>
                 <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />

hdApp/src/pagesPurchase/gathering.vue

@@ -179,7 +179,7 @@ export default {
         purchaseClearCreateOrder({ purchaseIds:arr.join(','),ghsId:that.option.id }).then(res => {
           if(res.code == 1) {
             if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
-              that.$util.confirmModal({content:'还有待完成的结账单',okText:'查看'},() => {
+              that.$util.confirmModal({content:'还有待完成的账单',okText:'查看'},() => {
                 that.pageTo({ url: '/admin/clear/list', type: 2})
               })              
             }else{

hdApp/src/pagesPurchase/purDetails.vue

@@ -274,7 +274,7 @@ export default {
         purchaseClearCreateOrder({ purchaseIds:id,ghsId:ghsId }).then(res => {
           if(res.code == 1) {
             if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
-              that.$util.confirmModal({content:'还有待完成的结账单',okText:'查看'},() => { that.pageTo({ url: '/admin/clear/list', type: 2}) })
+              that.$util.confirmModal({content:'还有待完成的账单',okText:'查看'},() => { that.pageTo({ url: '/admin/clear/list', type: 2}) })
             }else{
               that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond, type: 2 })
             }