shish 6 miesięcy temu
rodzic
commit
9b5617bb7f
36 zmienionych plików z 71 dodań i 71 usunięć
  1. 5 5
      ghsApp/src/admin/billing/affirm.vue
  2. 2 2
      ghsApp/src/admin/billing/toPay.vue
  3. 1 1
      ghsApp/src/admin/clear/info.vue
  4. 1 1
      ghsApp/src/admin/custom/set.vue
  5. 1 1
      ghsApp/src/admin/home/apply.vue
  6. 1 1
      ghsApp/src/admin/home/components/OrderItem.vue
  7. 1 1
      ghsApp/src/admin/home/member.vue
  8. 2 2
      ghsApp/src/admin/home/workbench.vue
  9. 7 7
      ghsApp/src/pages.json
  10. 5 5
      ghsApp/src/pagesClient/member/detail.vue
  11. 8 8
      ghsApp/src/pagesOrder/detail.vue
  12. 2 2
      ghsApp/src/pagesPurchase/info.vue
  13. 1 1
      ghsApp/src/pagesPurchase/jdSupplier.vue
  14. 1 1
      ghsApp/src/pagesPurchase/localSupplier.vue
  15. 1 1
      ghsApp/src/pagesPurchase/orderItem.vue
  16. 1 1
      ghsApp/src/pagesPurchase/supplier.vue
  17. 5 5
      hdApp/src/admin/billing/affirm.vue
  18. 2 2
      hdApp/src/admin/billing/toPay.vue
  19. 1 1
      hdApp/src/admin/goods/result.vue
  20. 1 1
      hdApp/src/admin/home/apply.vue
  21. 1 1
      hdApp/src/admin/home/order.vue
  22. 1 1
      hdApp/src/admin/home/workbench.vue
  23. 1 1
      hdApp/src/admin/member/detail.vue
  24. 2 2
      hdApp/src/admin/order/detail.vue
  25. 2 2
      hdApp/src/admin/order/info.vue
  26. 1 1
      hdApp/src/admin/order/itemOrder.vue
  27. 1 1
      hdApp/src/admin/order/refund.vue
  28. 1 1
      hdApp/src/admin/order/workOrder.vue
  29. 3 3
      hdApp/src/pages.json
  30. 1 1
      hdApp/src/pagesArrears/details.vue
  31. 1 1
      hdApp/src/pagesPurchase/addCgConfirm.vue
  32. 1 1
      hdApp/src/pagesPurchase/aliPay.vue
  33. 1 1
      hdApp/src/pagesPurchase/order.vue
  34. 1 1
      hdApp/src/pagesPurchase/orderItem.vue
  35. 1 1
      hdApp/src/pagesPurchase/pb.vue
  36. 3 3
      hdApp/src/pagesPurchase/wechatPay.vue

+ 5 - 5
ghsApp/src/admin/billing/affirm.vue

@@ -153,7 +153,7 @@
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                 <view class="tui-title">收款方式</view>
-                <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right: 35upx" > 账 </button>
+                <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right: 35upx" > 账 </button>
                 <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right: 35upx" > 待付款 </button>
                 <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right: 0upx">线下</button>
               </tui-list-cell>
@@ -172,8 +172,8 @@
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 2">
-                <view class="tui-title">账</view>
-                <view class="tui-input" style="color:#3385ff;">客户要赊账欠款的,选账</view>
+                <view class="tui-title">账</view>
+                <view class="tui-input" style="color:#3385ff;">客户要赊账欠款的,选账</view>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
@@ -1004,7 +1004,7 @@ export default {
       } else if (this.form.hasPay == 1) {
         name = '确认线下已付?';
       } else if (this.form.hasPay == 2) {
-        name = '确认账?';
+        name = '确认账?';
       } else {
         name = '确认提交';
       }
@@ -1078,7 +1078,7 @@ export default {
 
       if (book == 1) {
         if (this.form.hasPay != 2) {
-          this.$msg('预订单只能选择账');
+          this.$msg('预订单只能选择账');
           return false;
         }
         if (Number(this.form.sendCost) > 0) {

+ 2 - 2
ghsApp/src/admin/billing/toPay.vue

@@ -45,7 +45,7 @@
 
             </view>
             <view style="margin-top:20upx;">
-                <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">账</button>
+                <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">账</button>
             </view>
             <view style="margin-top:20upx;">
                 <button style="width:25vh;" @click="toCancel()" class="admin-button-com big default">取消</button>
@@ -226,7 +226,7 @@ export default {
       this.payWay = payWay
       let that = this
       if(payWay == 2){
-        that.$util.confirmModal({content:'确认账?'},() => {
+        that.$util.confirmModal({content:'确认账?'},() => {
             debtPay({id:this.orderId}).then(res=>{
               if(res.code == 1){
                 that.$msg(res.msg)

+ 1 - 1
ghsApp/src/admin/clear/info.vue

@@ -20,7 +20,7 @@
 					<view>支付方式:</view>
 					<view>
 						{{ detailInfo.payWay == 0 ?'线下微信':detailInfo.payWay == 1?'线下支付宝':detailInfo.payWay==2?'余额支付':
-						detailInfo.payWay==3?'账':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'-' }}
+						detailInfo.payWay==3?'账':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'-' }}
 					</view>
 				</view>
 				<view class="order-info_box">

+ 1 - 1
ghsApp/src/admin/custom/set.vue

@@ -12,7 +12,7 @@
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title ">新客账额度</view>
+					<view class="tui-title ">新客账额度</view>
 					<input type="number" v-model="form.allowDebtAmount" style="width:240upx;" @focus="form.allowDebtAmount=''" placeholder-class="phcolor" class="tui-input" name="allowDebtAmount" placeholder="请填写金额" />
 					<button class="admin-button-com middle blue" @click="allSetDebt" style="margin-left:10upx;">已有客户生效</button>
 				</tui-list-cell>

+ 1 - 1
ghsApp/src/admin/home/apply.vue

@@ -83,7 +83,7 @@ export default {
                         {name: "报损总览",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk.png`,url: "/admin/stat/waste"},
                         {name: "结账跟踪",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk.png`,url: "/admin/stat/clear"},
                         {name: "配送业绩",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk.png`,url: "/admin/stat/sendYj"},
-                        {name: "账汇总",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk.png`,url: "/admin/custom/showTotalBalance"},
+                        {name: "账汇总",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk.png`,url: "/admin/custom/showTotalBalance"},
                     ]
                 },
                 {

+ 1 - 1
ghsApp/src/admin/home/components/OrderItem.vue

@@ -7,7 +7,7 @@
         <image class="avatar" mode="aspectFit" :src="item.customAvatarUrl"></image>
         <view class="tit"> {{ item.customName || '' }}</view>
         <view class="other-refund" v-if="item.refund == 2">有售后</view>
-        <view class="other-status" v-if="item.debt == 1">账</view>
+        <view class="other-status" v-if="item.debt == 1">账</view>
         <text class="other-book" v-if="item.book == 1">预订单</text>
         <text class="other-presell" v-if="item.presell == 1">预售单</text>
         <view :class="['status', currentStatus == 4 ? 'buleColor' : currentStatus == 3 ? 'buleColor' : currentStatus == 1 ? 'defColor' : '']">

+ 1 - 1
ghsApp/src/admin/home/member.vue

@@ -115,7 +115,7 @@ export default {
           value: 0
         },
         {
-          name: "账",
+          name: "账",
           value: 0
         },
         {

+ 2 - 2
ghsApp/src/admin/home/workbench.vue

@@ -119,7 +119,7 @@
 						</div> 
 					</div>
 					<div class="total-list2"> 
-						<div class="app-color-3">账</div>
+						<div class="app-color-3">账</div>
 						<div class="list-num">
 							<view>{{countStat.debtCount||0}}</view>
 							<view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
@@ -179,7 +179,7 @@
 			<div class="total-blo">
 				<div class="total-list" v-for="(item, index) in overview" :key="index" @click="pageTo(item)">
 					<div class="list-num">
-						<block v-if="lookMoney == 0 && item.name=='总账'">0</block>
+						<block v-if="lookMoney == 0 && item.name=='总账'">0</block>
 						<block v-else>{{ $util.numberFormat(item.value) }}</block>
 					</div>
 					<div class="app-color-3">{{ item.name }}</div>

+ 7 - 7
ghsApp/src/pages.json

@@ -60,10 +60,10 @@
 			"pages": [
 				{"path": "set","style": {"navigationBarTitleText": "设置"}},
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
-				{"path": "showTotalBalance","style": {"navigationBarTitleText": "账与余额汇总"}},
+				{"path": "showTotalBalance","style": {"navigationBarTitleText": "账与余额汇总"}},
 				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级标准"}},
 				{"path": "visit","style": {"navigationBarTitleText": "今日访客"}},
-				{"path": "debtChange","style": {"navigationBarTitleText": "账变动明细","enablePullDownRefresh": false}},
+				{"path": "debtChange","style": {"navigationBarTitleText": "账变动明细","enablePullDownRefresh": false}},
 				{"path": "balanceChange","style": {"navigationBarTitleText": "余额变动明细","enablePullDownRefresh": false}},
 				{"path": "rechargeChange","style": {"navigationBarTitleText": "充值记录","enablePullDownRefresh": false}},
 				{"path": "addStaff","style": {"navigationBarTitleText": "帮客户添加员工"}},
@@ -400,17 +400,17 @@
 		{
 			"root": "pagesArrears",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "客户账", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "账订单", "enablePullDownRefresh": false } },
+				{ "path": "list", "style": { "navigationBarTitleText": "客户账", "enablePullDownRefresh": true } },
+				{ "path": "details", "style": { "navigationBarTitleText": "账订单", "enablePullDownRefresh": false } },
 				{ "path": "clearResult", "style": { "navigationBarTitleText": "结果"} }
 			]
 		},
 		{
 			"root": "pagesGys",
 			"pages": [
-				{ "path": "list", "style": { "navigationBarTitleText": "账单", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "账单", "enablePullDownRefresh": true } },
-				{ "path": "search", "style": { "navigationBarTitleText": "查找账单", "enablePullDownRefresh": false } },
+				{ "path": "list", "style": { "navigationBarTitleText": "账单", "enablePullDownRefresh": true } },
+				{ "path": "details", "style": { "navigationBarTitleText": "账单", "enablePullDownRefresh": true } },
+				{ "path": "search", "style": { "navigationBarTitleText": "查找账单", "enablePullDownRefresh": false } },
 				{ "path": "result", "style": { "navigationBarTitleText": "结果", "enablePullDownRefresh": false } }
 			]
 		},

+ 5 - 5
ghsApp/src/pagesClient/member/detail.vue

@@ -128,7 +128,7 @@
         <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>
+              <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}})">
@@ -136,7 +136,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>
@@ -145,7 +145,7 @@
             </tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">账额度</div>
+              <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: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>
@@ -156,7 +156,7 @@
             </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>
+              <div class="tui-title">账变动明细</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/custom/balanceChange?customId='+userInfo.id})">
@@ -283,7 +283,7 @@
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">账超额后</div>
+              <div class="tui-title">账超额后</div>
               <button class="admin-button-com middle" :class="[form.debtLimitPay == 0 ? 'blue' : 'default']" @click="debtLimitPayBtn(0)">现金可下单</button>
               <button class="admin-button-com middle" :class="[form.debtLimitPay == 1 ? 'blue' : 'default']" @click="debtLimitPayBtn(1)" style="margin-left:15upx;">现金不能下单</button>
             </tui-list-cell>

+ 8 - 8
ghsApp/src/pagesOrder/detail.vue

@@ -165,12 +165,12 @@
 					<view>
 						<block v-if="detailInfo.onlinePay == 2">
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
-								{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'账':'--' }}
+								{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'账':'--' }}
 							</text>
 						</block>
 						<block v-else>
 							<text :class="[detailInfo.payWay==3 && detailInfo.clearId == 0 ? 'red-mind' : 'normal-mind']">
-								{{ detailInfo.payWay==0?'线下微信':detailInfo.payWay==1?'线下支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'账':'--' }}
+								{{ detailInfo.payWay==0?'线下微信':detailInfo.payWay==1?'线下支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==3?'账':'--' }}
 							</text>
 						</block>
 						<text v-if="Number(detailInfo.clearId)>0" style="color:#3385ff;font-weight:bold;">(已结清)</text>
@@ -179,7 +179,7 @@
 						<button @click="pageTo({url: '/admin/clear/customInfo',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
 					</view>
 					<view class="price" v-if="detailInfo.debt == 1">
-						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com" style="border:1upx solid red;color:red;">全部账</button>
+						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com" style="border:1upx solid red;color:red;">全部账</button>
 					</view>
 				</view>
 				<view class="order-info_box" style="margin-top:40upx;">
@@ -444,7 +444,7 @@
 		<div class="app-footer">
 			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">取消</button>
 			<button @click="bookOrderCancel(detailInfo)" v-if="detailInfo.status == 2 && detailInfo.book == 1" class="admin-button-com middle blue" :class="active">取消</button>
-			<button @click="changePayWay(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">账</button>
+			<button @click="changePayWay(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">账</button>
 			<!-- #ifdef MP-WEIXIN -->
 			<button class="admin-button-com middle blue" open-type="share">分享</button>
 			<!-- #endif -->
@@ -1315,7 +1315,7 @@ export default {
 		},
 		changePayWay(info){
 			let that = this
-			that.$util.confirmModal({content:'确认账?'},() => {
+			that.$util.confirmModal({content:'确认账?'},() => {
 				debtPay({id:info.id}).then(res=>{
 					if(res.code == 1){
 						that.init()
@@ -1487,14 +1487,14 @@ export default {
 			}else if(s.type == 'confirm'){
 				let self = this;
 				uni.showActionSheet({
-					itemList: ['结算方式:', '账', '已收款'],
+					itemList: ['结算方式:', '账', '已收款'],
 					success: function (res) {
 						if(res.tapIndex == 0){
 							return false
 						}
 						let payWay = 0
-						let title = res.tapIndex == 1 ? '确认客户账?' : '确认已收款?'
-						//1账 2已收款
+						let title = res.tapIndex == 1 ? '确认客户账?' : '确认已收款?'
+						//1账 2已收款
 						let clearType = res.tapIndex == 1 ? 1 : 2;
 						//选择的已收款,还需要选择收款方式
 						if(clearType == 2){

+ 2 - 2
ghsApp/src/pagesPurchase/info.vue

@@ -68,9 +68,9 @@
 			<view class="bills-info_box content-box" style="margin-top:18upx;">
 				<view class="order-info_box" v-if="detailInfo.debt == 1">
 				<view>订单状态:</view>
-					<view style="color:red;font-weight:bold;">账</view>
+					<view style="color:red;font-weight:bold;">账</view>
 					<view class="price">
-						<text @click="goToClear(detailInfo)" style="font-weight:normal;color:#3385FF;">全部账</text>
+						<text @click="goToClear(detailInfo)" style="font-weight:normal;color:#3385FF;">全部账</text>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>

+ 1 - 1
ghsApp/src/pagesPurchase/jdSupplier.vue

@@ -21,7 +21,7 @@
             </view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list?ghsId'+item.id})"> 结账记录 </view>
-              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
+              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
               <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/order?ghsId='+item.id})">采购记录</view>
               <view class="cg-button">采购</view>
             </view>

+ 1 - 1
ghsApp/src/pagesPurchase/localSupplier.vue

@@ -21,7 +21,7 @@
             </view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list?ghsId'+item.id})"> 结账记录 </view>
-              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
+              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
               <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/wcOrder?ghsId='+item.id})">采购记录</view>
               <view class="cg-button">采购</view>
             </view>

+ 1 - 1
ghsApp/src/pagesPurchase/orderItem.vue

@@ -5,7 +5,7 @@
 				<text class="name">{{ info.supplierName }}</text>
 			</view>
 			<view v-if="info.refund == 2" class="status" style="color:red;border:1upx solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:50upx;">有售后</view>
-			<view v-if="info.debt == 1" class="status" style="color:red;border:1upx solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:50upx;">账</view>
+			<view v-if="info.debt == 1" class="status" style="color:red;border:1upx solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:50upx;">账</view>
 			<view class="status">
 				<text v-if="info.status == 3" style="font-weight:bold;color:green;">待入库</text>
 				<text v-else-if="info.status == 5" style="font-weight:bold;color:#CCCCCC;">已取消</text>

+ 1 - 1
ghsApp/src/pagesPurchase/supplier.vue

@@ -30,7 +30,7 @@
             </view>
             <view class="store_btn">
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list?ghsId='+item.id})"> 结账记录</view>
-              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
+              <view class="btn_entrance" @click.stop="getDebtList()"> 账变动明细 </view>
               <view class="btn_entrance" @click.stop="cgList(item)">采购记录</view>
               <view class="cg-button" @click="goToCg(item)">采购</view>
               <!-- <view class="my-cg-button" @click.stop="goToMyCg(item)">我的</view> -->

+ 5 - 5
hdApp/src/admin/billing/affirm.vue

@@ -128,7 +128,7 @@
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">账</button>
+            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">账</button>
 					</tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 0">
@@ -137,8 +137,8 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 2">
-            <view class="tui-title">账</view>
-            <view class="tui-input" style="color:#3385ff;">客户要欠款记账的 选记账</view>
+            <view class="tui-title">账</view>
+            <view class="tui-input" style="color:#3385ff;">客户要赊账欠款的 选挂账</view>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 4">
@@ -684,7 +684,7 @@ export default {
 
     //如果是扣除库存方式开单,不显示售后付款选项
     this.reduceStock = this.option.reduceStock?this.option.reduceStock:0
-    //如果扣除库存方法,付款方式默认选择账,这样方便提交
+    //如果扣除库存方法,付款方式默认选择账,这样方便提交
     if(this.reduceStock == 1){
       this.form.hasPay = 2
     }
@@ -1054,7 +1054,7 @@ export default {
           name = '确认开售后付款单?'
         }
       }else if(this.form.hasPay == 2){
-        name = '确认账?'
+        name = '确认账?'
       }else if(this.form.hasPay == 4){
         name = '确认余额支付?'
       }else{

+ 2 - 2
hdApp/src/admin/billing/toPay.vue

@@ -34,7 +34,7 @@
                 <button style="width:25vh;" class="admin-button-com big blue" @click="gotoOrderDetail()">订单详情</button>
             </view>
             <view style="margin-top:20upx;">
-                <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">账</button>
+                <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">账</button>
             </view>
             <view style="margin-top:20upx;">
                 <button style="width:25vh;" @click="toCancel()" class="admin-button-com big default">取消</button>
@@ -163,7 +163,7 @@ export default {
       this.payWay = payWay
       let that = this
       if(payWay == 2){
-        that.$util.confirmModal({content:'确认账?'},() => {
+        that.$util.confirmModal({content:'确认账?'},() => {
             debtPay({id:this.orderId}).then(res=>{
               if(res.code == 1){
                 that.$util.pageTo({ url: '/admin/billing/result?orderId='+this.orderId,type:2})

+ 1 - 1
hdApp/src/admin/goods/result.vue

@@ -31,7 +31,7 @@
                 			<button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
                 			<button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-left:6upx;">扫码</button>
 							<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-left:6upx;">线下</button>
-							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:6upx;">账</button>
+							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:6upx;">账</button>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">

+ 1 - 1
hdApp/src/admin/home/apply.vue

@@ -81,7 +81,7 @@ export default {
             {name: "采购花材", emoji: "🌸", url: "/admin/stat/cgItem",pf:1},
             {name: "绿植统计", emoji: "🌿", url: "/admin/stat/kindLz",pf:1},
             {name: "损耗总览", emoji: "⚠️", url: "/admin/stat/waste",pf:1},
-			      {name: "账汇总", emoji: "💳", url: "/admin/custom/showTotalBalance",pf:1},
+			      {name: "账汇总", emoji: "💳", url: "/admin/custom/showTotalBalance",pf:1},
           ]
         },
         {

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

@@ -39,7 +39,7 @@
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
             <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">{{ item.customName||'' }}<text v-if="item.bookName!=''" style="margin-left:30upx;color:#866b6b;font-weight: normal;">{{item.bookName}}</text></view>
-            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">账</view>
+            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">账</view>
             <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
             <view style="font-size:28upx;" class='app-price app-green' v-if="item.status==2&&item.sendType==1">待取货</view>
             <view style="font-size:28upx;" class='app-price app-green' v-else>{{ item.status | constantfilter('ORDER_STATUS') }}</view>

+ 1 - 1
hdApp/src/admin/home/workbench.vue

@@ -392,7 +392,7 @@
                 </view>
                 <view class="box_4 flex-col"></view>
                 <view class="box_9">
-                  <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
+                  <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
                   <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
                   <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> <text>买花记录</text> </view>
                   <view class="tag_2" @click.stop="callUp(ghsInfo)" style="color:green;font-weight:bold;"> <text>联系我们</text> </view>

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

@@ -142,7 +142,7 @@
     <view class="module-com content_box user-open_bx">
       <view class="input-line-wrap">
         <tui-list-cell @click="pageTo({ url: '/admin/order/debtList?id='+data.id })" class="line-cell" :hover="false" :arrow="true" >
-            <view class="tui-title">账订单</view>
+            <view class="tui-title">账订单</view>
         </tui-list-cell>
         <tui-list-cell @click="pageTo({ url: '/admin/settle/list?customId='+data.id })" class="line-cell" :hover="false" :arrow="true" >
             <view class="tui-title">结账记录</view>

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

@@ -203,10 +203,10 @@
                   class="value" 
                   v-if="Number(orderInfo.remainDebtPrice)>0" 
                   style="color:red;font-weight:bold;">
-                  
+                  
                 </view>
                 <view v-else class="value" style="color:#3385ff;font-weight:bold;">
-                  账<text>(已清)</text>
+                  账<text>(已清)</text>
                 </view>
               </block>
               <view class="value" v-else>

+ 2 - 2
hdApp/src/admin/order/info.vue

@@ -130,13 +130,13 @@
                   class="value" 
                   v-if="Number(orderInfo.remainDebtPrice)>0" 
                   style="color:red;font-weight:bold;">
-                  
+                  
                 </view>
                 <view 
                   v-else 
                   class="value"  
                   style="color:#3385ff;font-weight:bold;">
-                  账<text>(已结清)</text>
+                  账<text>(已结清)</text>
                 </view>
               </block>
               <view class="value" v-else>

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

@@ -6,7 +6,7 @@
           <block v-if="!$util.isEmpty(item)">
             <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
               <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
-              <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">账</view>
+              <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">账</view>
               <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
               <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
             </view>

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

@@ -449,7 +449,7 @@ export default {
 								//线下微信、支付宝、现金和银行卡付款
 								this.$util.pageTo({url:'/admin/refund/offlineRemind?orderId='+this.orderInfo.id+'&amount='+this.refundMoney+'&payWay='+this.orderInfo.payWay,type:2})
 							}else{
-								//账的
+								//账的
 								this.$util.pageTo({url:'/admin/refund/debtResult?orderId='+this.orderInfo.id+'&amount='+this.refundMoney,type:2})
 							}
 						}

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

@@ -32,7 +32,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">收款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-            <button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">账</button>
+            <button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">账</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1 && form.fromType == 3">

+ 3 - 3
hdApp/src/pages.json

@@ -55,11 +55,11 @@
 			"pages": [
 				{"path": "addCustom","style": {"navigationBarTitleText": "添加客户"}},
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
-				{"path": "showTotalBalance","style": {"navigationBarTitleText": "账与余额汇总"}},
+				{"path": "showTotalBalance","style": {"navigationBarTitleText": "账与余额汇总"}},
 				{"path": "balanceChange","style": {"navigationBarTitleText": "总余额变动"}},
 				{"path": "balancePayChange","style": {"navigationBarTitleText": "充值余额变动"}},
 				{"path": "balanceGiveChange","style": {"navigationBarTitleText": "赠送余额变动"}},
-				{"path": "debtChange","style": {"navigationBarTitleText": "账变动明细"}},
+				{"path": "debtChange","style": {"navigationBarTitleText": "账变动明细"}},
 				{"path": "rechargeChange","style": {"navigationBarTitleText": "充值记录"}},
 				{"path": "levelChange","style": {"navigationBarTitleText": "等级变动记录"}},
 				{"path": "visit","style": {"navigationBarTitleText": "今日访客"}}
@@ -208,7 +208,7 @@
 				{ "path": "teachPay", "style": {"navigationBarTitleText": "教程"}},
 				{ "path": "result", "style": {"navigationBarTitleText": "付款成功"}},
 				{ "path": "addGhs", "style": {"navigationBarTitleText": "添加"}},
-				{ "path": "debtChange", "style": {"navigationBarTitleText": "账变动明细"}},
+				{ "path": "debtChange", "style": {"navigationBarTitleText": "账变动明细"}},
 				{ "path": "balanceChange", "style": {"navigationBarTitleText": "余额变动"}},
 				{ "path": "rechargeChange", "style": {"navigationBarTitleText": "充值记录"}}
 			]

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

@@ -3,7 +3,7 @@
     <view class="top-view">
       <view class="top-row">
         <text class="header-item"> 客户</text>
-        <text class="header-item">总账 </text>
+        <text class="header-item">总账 </text>
       </view>
       <view class="top-row">
         <view class="info-item">

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

@@ -46,7 +46,7 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">付款方式</view>
-						<button @click="payMode = 0" class="admin-button-com middle" :class="payMode == 0 ? 'blue' : 'default'">账</button>
+						<button @click="payMode = 0" class="admin-button-com middle" :class="payMode == 0 ? 'blue' : 'default'">账</button>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >

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

@@ -177,7 +177,7 @@ export default {
     },
     confirmDebtPay() {
       let that = this
-      that.$util.confirmModal({content:'确认账?'},() => {
+      that.$util.confirmModal({content:'确认账?'},() => {
         uni.showLoading({mask:true})
         purchaseDebtPay({ orderSn: that.orderSn }).then(res => {
           uni.hideLoading()

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

@@ -42,7 +42,7 @@
               </view>
               <view class="box_4 flex-col"></view>
               <view class="box_9">
-                <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
+                <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
                 <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
                 <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping?ghsId='+ghsInfo.id+'&ghsName='+ghsInfo.name})"> <text>买花记录</text> </view>
                 <view class="tag_2" @click.stop="callUp(ghsInfo)" style="color:green;font-weight:bold;"> <text>联系我们</text> </view>

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

@@ -9,7 +9,7 @@
         </text>
       </view>
       <view v-if="info.refund == 2" class="status" style="color:red;border:1px solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:40upx;">有退款</view>
-      <view v-if="info.debt == 1" class="status" style="color:red;border:1px solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:40upx;">账</view>
+      <view v-if="info.debt == 1" class="status" style="color:red;border:1px solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:40upx;">账</view>
       <text v-if="info.book == 1" class="status"  style="color:white;border:1px solid #657cac;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:40upx;background:#657cac;">预订单</text>
       <view class="status" v-if="info.status == 3" style="color:green;font-weight:bold;">{{ getStatusName }} </view>
       <view class="status" v-else-if="info.status == 5" style="color:red;font-weight:bold;font-size:30upx;">{{ getStatusName }} </view>

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

@@ -15,7 +15,7 @@
           </view>
           <view class="box_4 flex-col"></view>
           <view class="box_9">
-            <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
+            <view class="tag_2" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})"> <text>账变动记录</text> </view>
             <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
             <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
           </view>

+ 3 - 3
hdApp/src/pagesPurchase/wechatPay.vue

@@ -36,7 +36,7 @@
           <view v-else>
             <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="height:100upx;line-height:50upx;" :disabled="remainPayTime >0 ? false : true" @click="wxPayFn">微信支付</button>
           </view>
-          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="height:100upx;line-height:100upx;margin-top:60upx;padding:0;display:flex;align-items:center;justify-content:center;width:70%;margin-left:auto;margin-right:auto;" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">账</button>
+          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="height:100upx;line-height:100upx;margin-top:60upx;padding:0;display:flex;align-items:center;justify-content:center;width:70%;margin-left:auto;margin-right:auto;" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">账</button>
 
           <button class="button-com" @click="useAliPay()" :class="[remainPayTime >0 ? 'ali-btn green':'default']" style="height:100upx;line-height:100upx;margin-top:65upx;padding:0;display:flex;align-items:center;justify-content:center;width:70%;margin-left:auto;margin-right:auto;" :disabled="remainPayTime > 0 ? false : true">支付宝付款</button>
 
@@ -49,7 +49,7 @@
             <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn(0)">微信支付</button>
           </view>
           <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'ali-btn':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn(1)">支付宝支付</button>
-          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">账</button>
+          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">账</button>
           <view style="color:#CCCCCC;font-size:26upx;text-align: center;margin-top:50upx;" @click="beginOpenMini()">小程序</view>
         </div>
         <!-- #endif -->
@@ -212,7 +212,7 @@ export default {
     },
     confirmDebtPay() {
       let that = this
-      that.$util.confirmModal({content:'确认账?'},() => {
+      that.$util.confirmModal({content:'确认账?'},() => {
         uni.showLoading({mask:true})
         purchaseDebtPay({ orderSn: that.orderSn }).then(res => {
           uni.hideLoading()