shish há 6 meses atrás
pai
commit
8f3275198c

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

@@ -6,7 +6,7 @@
 					<t-th><view style="width:150upx;">创建 / 账单</view></t-th>
 					<t-th><view style="width:230upx;">事项</view></t-th>
 					<t-th>变动</t-th>
-					<t-th>剩余欠款</t-th>
+					<t-th>剩余待结</t-th>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 					<t-tr>

+ 14 - 5
ghsApp/src/admin/custom/distCustom.vue

@@ -15,7 +15,8 @@
                 <view class="tui-user-name">
                   {{ item.name }}
                   <text v-if="item.level == 2" class="super-man">大客</text>
-                  <text v-if="item.level == 0" class="ls-man">散客</text>
+                  <text v-if="item.level == 9" class="cost-man">成本</text>
+                  <text v-if="item.level == 0" class="ls-man">零售</text>
                 </view>
               </view>
               <view class="tui-msg-content">
@@ -293,7 +294,6 @@ export default {
       font-size: 32upx;
       .super-man{
         margin-left:30upx;
-        color:red;
         font-size:24upx;
         display:inline-block;
         color:white;
@@ -302,14 +302,23 @@ export default {
         background-color: green;
         border-radius: 11upx;
       }
-      .ls-man{
+      .cost-man{
         margin-left:30upx;
         font-size:24upx;
         display:inline-block;
         color:white;
-        border:1upx solid #a5b1a5;
+        border:1upx solid red;
+        padding:6upx 10upx;
+        background-color: red;
+        border-radius: 11upx;
+      }
+      .ls-man{
+        margin-left:30upx;
+        font-size:24upx;
+        display:inline-block;
+        color:#6f756f;
+        border:1upx solid #6f756f;
         padding:6upx 10upx;
-        background-color: #a5b1a5;
         border-radius: 11upx;
       }
     }

+ 15 - 6
ghsApp/src/admin/custom/selectCustom.vue

@@ -15,14 +15,15 @@
                 <div class="tui-user-name">
                   {{ item.name }}
                   <text v-if="item.level == 2" class="super-man">大客</text>
-                  <text v-if="item.level == 0" class="ls-man">散客</text>
+                  <text v-if="item.level == 9" class="cost-man">成本</text>
+                  <text v-if="item.level == 0" class="ls-man">零售</text>
                 </div>
               </div>
               <div class="tui-msg-content">
                 <span>{{ item.visitTime.substr(5,11) }}</span>
 
                 <span v-if="Number(item.remainDebtAmount) > 0" class="debt-amount">
-                  欠款<span class="amount_num">{{item.remainDebtAmount}}</span>
+                  待结<span class="amount_num">{{item.remainDebtAmount}}</span>
                 </span>
 
                 <span v-if="Number(item.remainDebtAmount) < 0" class="debt-amount">
@@ -284,7 +285,6 @@ export default {
       font-size: 32upx;
       .super-man{
         margin-left:30upx;
-        color:red;
         font-size:24upx;
         display:inline-block;
         color:white;
@@ -293,14 +293,23 @@ export default {
         background-color: green;
         border-radius: 11upx;
       }
-      .ls-man{
+      .cost-man{
         margin-left:30upx;
         font-size:24upx;
         display:inline-block;
         color:white;
-        border:1upx solid #a5b1a5;
+        border:1upx solid red;
+        padding:6upx 10upx;
+        background-color: red;
+        border-radius: 11upx;
+      }
+      .ls-man{
+        margin-left:30upx;
+        font-size:24upx;
+        display:inline-block;
+        color:#6f756f;
+        border:1upx solid #6f756f;
         padding:6upx 10upx;
-        background-color: #a5b1a5;
         border-radius: 11upx;
       }
     }

+ 16 - 6
ghsApp/src/admin/home/member.vue

@@ -24,7 +24,8 @@
                 <div class="tui-user-name">
                   {{ item.name }}
                   <text v-if="item.level == 2" class="super-man">大客</text>
-                  <text v-if="item.level == 0" class="ls-man">零售客</text>
+                  <text v-if="item.level == 9" class="cost-man">成本</text>
+                  <text v-if="item.level == 0" class="ls-man">零售</text>
                 </div>
               </div>
               <div class="tui-msg-content">
@@ -32,7 +33,7 @@
                 <span v-if="tabIndex == 1" class="debt-amount">消费 <span class="amount_num">{{parseFloat(item.buyAmount)}}</span> </span>
                 <span v-else>
                   <span v-if="Number(item.remainDebtAmount)>0" class="debt-amount">
-                    欠款<span class="amount_num">{{ item.remainDebtAmount }}</span>
+                    待结<span class="amount_num">{{ item.remainDebtAmount }}</span>
                   </span>
                   <span v-if="Number(item.remainDebtAmount)<0" class="debt-amount">
                     余额<span class="amount_num" style="color:#3385FF;">{{ Math.abs(item.remainDebtAmount) }}</span>
@@ -135,7 +136,7 @@ export default {
           value: 0
         },
         {
-          name: "删除",
+          name: "删除",
           value: 0
         }
       ],
@@ -400,14 +401,23 @@ export default {
         background-color: green;
         border-radius: 11upx;
       }
-      .ls-man{
+      .cost-man{
         margin-left:20upx;
         font-size:24upx;
         display:inline-block;
         color:white;
-        border:1upx solid #a5b1a5;
+        border:1upx solid red;
+        padding:8upx 10upx;
+        background-color: red;
+        border-radius: 11upx;
+      }
+      .ls-man{
+        margin-left:20upx;
+        font-size:24upx;
+        display:inline-block;
+        color:#6f756f;
+        border:1upx solid #6f756f;
         padding:8upx 10upx;
-        background-color: #a5b1a5;
         border-radius: 11upx;
       }
     }

+ 1 - 1
ghsApp/src/admin/shop/debtChange.vue

@@ -6,7 +6,7 @@
 					<t-th><view style="width:150upx;">日期</view></t-th>
 					<t-th><view style="width:230upx;">事项</view></t-th>
 					<t-th>变动</t-th>
-					<t-th>剩余欠款</t-th>
+					<t-th>剩余待结</t-th>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index">
 					<t-tr>

+ 8 - 7
ghsApp/src/pagesClient/member/detail.vue

@@ -150,15 +150,15 @@
               <button class="admin-button-com blue middle" @tap="amendMoney">确定</button>
 						</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" :arrow="true" @click="pageTo({url:'/admin/order/itemOrder?customId='+userInfo.id})">
               <div class="tui-title">下单记录</div>
               <view style="font-size:24upx;" v-if="userInfo.recentExpend!='0000-00-00 00:00:00'">最近下单 {{ userInfo.recentExpend ? userInfo.recentExpend.substr(5,11) : '' }}</view>
             </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" :arrow="true" @click="pageTo({ url: '/admin/custom/balanceChange?customId='+userInfo.id})">
               <div class="tui-title">余额变动明细</div>
             </tui-list-cell>
@@ -170,9 +170,10 @@
             <view style="border:2upx solid #CCCCCC;">
               <tui-list-cell class="line-cell" :hover="false">
                 <div class="tui-title">下单价格</div>
-                <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:14upx;margin-right:14upx;">批发价</button>
-                <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)">大客价</button>
+                <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:5upx;">批发</button>
+                <button class="admin-button-com middle" :class="[form.level == 2 ? 'blue' : 'default']" @click="changeLevelBtn(2)" style="margin-left:5upx;">大客</button>
+                <button class="admin-button-com middle" :class="[form.level == 9 ? 'blue' : 'default']" @click="changeLevelBtn(9)" style="margin-left:5upx;">成本</button>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :hover="false" v-if="form.home == 1">

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

@@ -329,7 +329,7 @@ export default {
 					return false
 				}
 				//如果退款金额大于剩余欠款,则提醒走开付款单方式退款
-				this.$util.confirmModal({content:'售后金额超过剩余欠款,只能开付款单方式售后'},() => {
+				this.$util.confirmModal({content:'售后金额超过剩余欠款,售后请开红冲单'},() => {
 					this.shAddPay = 1
 					this.confirmRefund()
 				})