shish 1 год назад
Родитель
Сommit
f8ead71db4

+ 4 - 1
mallApp/src/api/member/index.js

@@ -1,6 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
-//
+export const getMemberChange = data => {
+	return https.get('/member-change/list', data)
+}
+
 export const getMemberWeal = data => {
 	return https.get('/member-weal/get-weal', data)
 }

+ 4 - 4
mallApp/src/pages/custom/levelChange.vue

@@ -8,20 +8,20 @@
                             <text class="date-text">{{ item.addTime.substr(5,11) }}</text>
                         </view>
                         <view class="staff-info">
-                            <text class="staff-name">{{ item.staffName }}</text>
+                            <text class="staff-name">{{ item.staffName!=''?item.staffName:'系统' }}</text>
                         </view>
                     </view>
                     
                     <view class="record-content">
                         <view class="event-section">
-                            <text class="event-label">变更事项</text>
+                            <text class="event-label">事项</text>
                             <text class="event-value">{{ item.event }}</text>
                         </view>
                         
                         <view class="change-section">
                             <view class="change-item">
                                 <text class="change-label">变化前</text>
-                                <text class="change-value before">{{ item.beforeName }}</text>
+                                <text class="change-value before">{{ item.beforeName!=''?item.beforeName:'普通用户' }}</text>
                             </view>
                             <view class="change-arrow">
                                 <text class="arrow-icon">→</text>
@@ -57,7 +57,7 @@ export default {
     methods: {
         async init(){
             let id = this.option.id ? this.option.id : 0
-            const res = await getMemberChange({ page:this.list.page,customId:id })
+            const res = await getMemberChange({ page:this.list.page,hdId:id })
             if (this.$util.isEmpty(res.data.list)){
                 this.completes(res)
                 return

+ 13 - 16
mallApp/src/pages/home/recent.vue

@@ -32,10 +32,10 @@
                 </view>
                 <view class="box_4 flex-col"></view>
                 <view class="box_9">
-                  <view class="tag_2" @click="getLevelChange()"> <text>等级变动</text> </view>
-                  <view class="tag_2" @click="getBalanceChange()"> <text>余额变动</text> </view>
-                  <view class="tag_2" @click="getSettleList()"> <text>结账记录</text> </view>
-                  <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
+                  <view class="tag_2" @click="getLevelChange(item)"> <text>等级变动</text> </view>
+                  <view class="tag_2" @click="getBalanceChange(item)"> <text>余额变动</text> </view>
+                  <view class="tag_2" @click="getSettleList(item)"> <text>结账记录</text> </view>
+                  <view class="tag_2" @click="getBuyList(item)"> <text>买花记录</text> </view>
                 </view>
 
               <view class="box_6 flex-row" @click.stop="recharge(item)" v-if="Number(item.balance)<0">
@@ -140,20 +140,17 @@ export default {
         // #endif
       })
     },
-    getSettleList(){
-      this.pageTo({ url:'/pages/settle/list?id='+this.id+'&account='+this.account})
+    getSettleList(item){
+      this.pageTo({ url:'/pages/settle/list?id='+item.id+'&account='+item.shopId})
     },
-    getLevelChange(){
-      this.pageTo({ url:'/pages/custom/levelChange?id='+this.id+'&account='+this.account})
+    getLevelChange(item){
+      this.pageTo({ url:'/pages/custom/levelChange?id='+item.id+'&account='+item.shopId})
     },
-    getBalanceChange(){
-      this.pageTo({ url:'/pages/balance/changeList?id='+this.id+'&account='+this.account})
+    getBalanceChange(item){
+      this.pageTo({ url:'/pages/balance/changeList?id='+item.id+'&account='+item.shopId})
     },
-    getBuyList(){
-      this.pageTo({ url:'/pages/order/list'})
-    },
-    showTip(){
-      this.$msg('开发中')
+    getBuyList(item){
+      this.pageTo({ url:'/pages/order/list?id='+item.id+'&account='+item.shopId})
     },
     bug(item){
       this.pageTo({ url:'/pages/item/item?account='+item.shopId+'&hdId='+item.id})
@@ -162,7 +159,7 @@ export default {
         this.getMyHdList()
     },
     getMyHdList(){
-      return getList({page: this.list.page,}).then(res=>{
+      return getList({page: this.list.page}).then(res=>{
         this.completes(res);
         if (this.$util.isEmpty(res.data)){
           return false