记账

hdApp/src/admin/billing/affirm.vue

@@ -132,7 +132,7 @@
 							</view>
 							<view class="button-row">
                 <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-								<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
+								<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">记账</button>
 							</view>
 						</view>
 					</tui-list-cell>
@@ -528,7 +528,7 @@ export default {
         }else if(this.form.hasPay == 1){
           name = '确认线下付款？'
         }else if(this.form.hasPay == 2){
-          name = '确认赊账？'
+          name = '确认记账？'
         }else if(this.form.hasPay == 4){
           name = '确认余额支付？'
         }else{

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>
@@ -168,7 +168,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)

hdApp/src/admin/custom/showTotalBalance.vue

@@ -4,7 +4,7 @@
 			<view class="module-com input-line-wrap">
 
 				<tui-list-cell class="line-cell" :hover="false" v-if="Number(pfShopId)>0">
-					<view class="tui-title">批发总赊账</view>
+					<view class="tui-title">批发总记账</view>
 					<view>{{ pfDebt }}</view>
 				</tui-list-cell>
 
@@ -14,7 +14,7 @@
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">零售总赊账</view>
+					<view class="tui-title">零售总记账</view>
 					<view>{{ lsDebt }}</view>
 				</tui-list-cell>
 

hdApp/src/admin/home/apply.vue

@@ -100,7 +100,7 @@ export default {
             {name: "采购花材",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/cgItem",pf:1},
             {name: "绿植统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/kindLz",pf:1},
             {name: "损耗总览",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/waste"},
-			{name: "赊账汇总",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/custom/showTotalBalance"},
+			{name: "记账汇总",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/custom/showTotalBalance"},
           ]
         }
       ]

hdApp/src/admin/home/member.vue

@@ -87,7 +87,7 @@ export default {
           value: 0
         },
         {
-          name: "赊账排行",
+          name: "记账排行",
           value: 0
         },
       ]

hdApp/src/admin/home/order.vue

@@ -12,7 +12,7 @@
 			</view>
 			<view style="float:right">
       <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="selectStaffFn()">员工</button>
-      <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="debtChangeFn()">赊账单</button>
+      <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="debtChangeFn()">记账单</button>
       <button class="admin-button-com middle blue" @click="cancelFn()">清空搜索</button>
 			</view>
 		</view>
@@ -21,7 +21,7 @@
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="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.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>

hdApp/src/admin/home/workbench.vue

@@ -65,7 +65,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>
@@ -114,7 +114,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="item.name=='总赊账'">查看</block>
+                <block v-if="item.name=='总记账'">查看</block>
                 <block v-else>{{ $util.numberFormat(item.value) }}</block>
               </div>
             <div class="app-color-3">{{ item.name }}</div>

hdApp/src/admin/member/detail.vue

@@ -709,13 +709,13 @@ export default {
         .member-name {
           font-weight: 600;
           font-size: 28upx;
-          color: #3385ff;
+          color: #09C567;
           text-align: right;
         }
         
         .discount-tag {
           font-size: 24upx;
-          color: #3385ff;
+          color: #09C567;
           margin-top: 4upx;
           background-color: #f0f7ff;
           padding: 2upx 8upx;
@@ -769,7 +769,7 @@ export default {
         height: 48upx;
         @include disFlex(center, center);
         border-radius: 50%;
-        font-size: 34upx;
+        font-size: 36upx;
       }
       
       .edit-btn {
@@ -784,7 +784,7 @@ export default {
       .call-btn {
         background-color: #e8f5e8;
         color: #28a745;
-        font-size: 38upx;
+        font-size: 42upx;
         
         &:active {
           background-color: #d4edda;

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>

hdApp/src/admin/order/workOrder.vue

@@ -35,7 +35,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">

hdApp/src/pages.json

@@ -52,7 +52,7 @@
 			"pages": [
 				{"path": "addCustom","style": {"navigationBarTitleText": "添加客户"}},
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
-				{"path": "showTotalBalance","style": {"navigationBarTitleText": "赊账与余额汇总"}},
+				{"path": "showTotalBalance","style": {"navigationBarTitleText": "记账与余额汇总"}},
 				{"path": "balanceChange","style": {"navigationBarTitleText": "余额变动"}},
 				{"path": "debtChange","style": {"navigationBarTitleText": "欠款变动明细"}},
 				{"path": "rechargeChange","style": {"navigationBarTitleText": "充值记录"}},

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">

hdApp/src/pagesPurchase/aliPay.vue

@@ -176,7 +176,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()

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>

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="margin-top:60upx;" :disabled="remainPayTime >0 ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">赊账</button>
+          <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:60upx;" :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="margin-top:65upx;" :disabled="remainPayTime > 0 ? false : true">用支付宝付款</button>
 
@@ -48,7 +48,7 @@
             <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'green':'default']" :disabled="remainPayTime >0 ? false : true" @click="appWxPayFn">微信支付</button>
           </view>
           <button class="button-com pay-wx" :class="[remainPayTime >0 ? 'ali-btn':'default']" :disabled="remainPayTime >0 ? false : true" @click="appAliPayFn">支付宝支付</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>
         </div>
         <!-- #endif -->
         </block>
@@ -174,7 +174,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()