红包

ghsApp/src/admin/hb/rechargeList.vue

@@ -0,0 +1,63 @@
+<template>
+	<div>
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th align="center">名称</t-th>
+					<t-th align="center">金额</t-th>
+					<t-th align="center">时间</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list.data" :key="index">
+					<t-td align="center" color="info"><view>{{item.customName}}</view></t-td>
+					<t-td align="center" color="info"><view>{{item.amount}}</view></t-td>
+					<t-td align="center" color="info"><view>{{item.addTime.substr(0,10)}}</view></t-td>
+				</t-tr>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</div>
+</template>
+
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { customRechargeList } from '@/api/recharge'
+import list from '@/mixins/list'
+export default {
+	name: "customRechargeList",
+	components: {
+		AppWrapperEmpty
+	},
+	mixins:[list],
+	data() {
+		return {
+			
+		};
+	},
+	methods: {
+		async init(){
+			const res = await customRechargeList({
+				page:this.list.page
+			})
+			this.completes(res)
+		}
+	},
+	async onPullDownRefresh() {
+		this.resetList();
+		await this.init()
+		uni.stopPullDownRefresh();
+	},
+	async onReachBottom() {
+		if (!this.list.finished) {
+			await this.init()
+			uni.stopPullDownRefresh();;
+		} else {
+			uni.stopPullDownRefresh();
+		}
+	},
+	
+};
+</script>
+
+<style lang="scss" scoped></style>

ghsApp/src/admin/home/apply.vue

@@ -35,7 +35,8 @@ export default {
                     title:'营销推广',
                     list:[
                         {name: "红包",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/list"},
-                        {name: "充值活动",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/item/rechargeHb"},
+                        {name: "充值返利",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/item/rechargeHb"},
+                        {name: "充值客户",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/admin/hb/rechargeList"},
                         {name: "邀请开店",img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,url: "/pagesInvite/list"}
                     ]
                 },

ghsApp/src/api/recharge/index.js

@@ -16,4 +16,9 @@ export const getRechargeHbDetail = data => {
 
 export const saveRechargeHb = async data => {
 	return https.post("/recharge-hb/save-hb", data);
+}
+
+//客户充值记录
+export const customRechargeList = data => {
+	return https.get('/recharge/custom-list', data)
 }

ghsApp/src/pages.json

@@ -531,7 +531,8 @@
 		{
 			"root": "admin/hb",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "红包"}}
+				{"path": "list","style": {"navigationBarTitleText": "红包"}},
+				{"path": "rechargeList","style": {"navigationBarTitleText": "充值记录"}}
 			]
 		}
 	],

ghsApp/src/pagesStore/me/rechargeList.vue

@@ -24,7 +24,6 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 		</block>
-    <!-- <kd-entrance></kd-entrance> -->
 	</div>
 </template>
 

hdApp/src/pagesPurchase/purDetails.vue

@@ -158,7 +158,7 @@
       </view>
       <view class="content-box price-detail">
         <div 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(detailInfo.sendCost)>0">
             <div class="tui-title">运费</div>
             <div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.sendCost }}</div>
           </tui-list-cell>

hdApp/src/pagesStore/me/shopYeChange.vue

@@ -10,7 +10,7 @@
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 					<t-tr>
-						<t-td align="center" color="info"><view >{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view style="width:200rpx;">{{ item.event }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ parseFloat(item.amount) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ parseFloat(item.txBalance) }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>