shish пре 1 година
родитељ
комит
acf2978ab5

+ 12 - 6
hdApp/src/admin/custom/balanceChange.vue

@@ -11,16 +11,16 @@
                     </t-tr>
                     </t-tr>
                     <view v-for="(item, index) in list.data" :key="index">
                     <view v-for="(item, index) in list.data" :key="index">
                         <t-tr>
                         <t-tr>
-                            <t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
-                            <t-td align="center" color="info"><view style="width:180upx;">{{ item.event }}</view></t-td>
-                            <t-td align="center" color="info"><view >{{ item.staffName }}</view></t-td>
-                            <t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
-                            <t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
+                            <t-td align="center" color="info"><view @click="goDetail(item)">{{ item.addTime.substr(5,11) }}</view></t-td>
+                            <t-td align="center" color="info"><view style="width:180upx;" @click="goDetail(item)">{{ item.event }}</view></t-td>
+                            <t-td align="center" color="info"><view @click="goDetail(item)">{{ item.staffName }}</view></t-td>
+                            <t-td align="center" color="info"><view @click="goDetail(item)">{{ item.amount }}</view></t-td>
+                            <t-td align="center" color="info"><view @click="goDetail(item)">{{ parseFloat(item.balance) }}</view></t-td>
                         </t-tr>
                         </t-tr>
                         <block v-if="!$util.isEmpty(item.remark)">
                         <block v-if="!$util.isEmpty(item.remark)">
                             <t-tr>
                             <t-tr>
                                 <t-td align="left" color="info">
                                 <t-td align="left" color="info">
-                                    备注:<text style="color:red;font-weight:bold;">{{ item.remark }}</text>
+                                    <view @click="goDetail(item)">备注:<text style="color:red;font-weight:bold;">{{ item.remark }}</text></view>
                                 </t-td>
                                 </t-td>
                             </t-tr>
                             </t-tr>
                         </block>
                         </block>
@@ -47,6 +47,12 @@
             };
             };
         },
         },
         methods: {
         methods: {
+            goDetail(item){
+                if(item.capitalType == 0){
+                    //订单详情
+                    this.$util.pageTo({url: '/admin/order/detail?id='+item.relateId})
+                }
+            },
             async init(){
             async init(){
                 let id = this.option.id ? this.option.id : 0
                 let id = this.option.id ? this.option.id : 0
                 const res = await getBalanceChangeList({ page:this.list.page,customId:id })
                 const res = await getBalanceChangeList({ page:this.list.page,customId:id })

+ 5 - 3
hdApp/src/admin/custom/showTotalBalance.vue

@@ -3,12 +3,12 @@
 		<form>
 		<form>
 			<view class="module-com input-line-wrap">
 			<view class="module-com input-line-wrap">
 
 
-				<tui-list-cell class="line-cell" :hover="false">
+				<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>
 					<view>{{ pfDebt }}</view>
 				</tui-list-cell>
 				</tui-list-cell>
 
 
-				<tui-list-cell class="line-cell" :hover="false">
+				<tui-list-cell class="line-cell" :hover="false" v-if="Number(pfShopId)>0">
 					<view class="tui-title">批发总余额</view>
 					<view class="tui-title">批发总余额</view>
 					<view>{{ pfBalance }}</view>
 					<view>{{ pfBalance }}</view>
 				</tui-list-cell>
 				</tui-list-cell>
@@ -44,7 +44,8 @@ export default {
 			lsBalance:0,
 			lsBalance:0,
 			lsDebt:0,
 			lsDebt:0,
 			pfBalance:0,
 			pfBalance:0,
-			pfDebt:0
+			pfDebt:0,
+			pfShopId:0
 		}
 		}
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -60,6 +61,7 @@ export default {
 					this.lsDebt = res.data.ls.debt||0
 					this.lsDebt = res.data.ls.debt||0
 					this.pfBalance = res.data.pf.balance||0
 					this.pfBalance = res.data.pf.balance||0
 					this.pfDebt = res.data.pf.debt||0
 					this.pfDebt = res.data.pf.debt||0
+					this.pfShopId = res.data.pfShopId||0
 				}
 				}
 			})
 			})
 		}
 		}

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

@@ -27,11 +27,6 @@
           <div class="app-color-3">余额</div>
           <div class="app-color-3">余额</div>
         </div>
         </div>
 
 
-        <div class="data-list" @click="pageTo({ url: '/admin/order/debtList?id='+data.id })">
-          <div class="app-size-30 app-bold">{{ debtAmount }}</div>
-          <div class="app-color-3">欠款</div>
-        </div>
-
         <div class="data-list">
         <div class="data-list">
           <div class="app-size-30 app-bold">{{ buyAmount }}</div>
           <div class="app-size-30 app-bold">{{ buyAmount }}</div>
           <div class="app-color-3">累计消费</div>
           <div class="app-color-3">累计消费</div>
@@ -98,7 +93,7 @@
             <view class="tui-title">等级变动记录</view>
             <view class="tui-title">等级变动记录</view>
         </tui-list-cell>
         </tui-list-cell>
         <tui-list-cell @click="pageTo({ url: '/admin/custom/debtChange?customId='+data.id })" class="line-cell" :hover="false" :arrow="true" >
         <tui-list-cell @click="pageTo({ url: '/admin/custom/debtChange?customId='+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>
       </view>
       </view>
     </view>
     </view>