花店零售--"我的"页面增加 余额明细

ghsApp/package-lock.json

@@ -2286,6 +2286,11 @@
       "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
       "dev": true
     },
+    "atob-lite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz",
+      "integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY="
+    },
     "autoprefixer": {
       "version": "9.7.4",
       "resolved": "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-9.7.4.tgz?cache=0&sync_timestamp=1579034635912&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-9.7.4.tgz",
@@ -4325,6 +4330,11 @@
       "integrity": "sha1-P7rwIL/XlIhAcuomsel5HUWmKfA=",
       "dev": true
     },
+    "dtype": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz",
+      "integrity": "sha1-zQUjI84GFETs0uj1dI9popvihDQ="
+    },
     "duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.1.tgz",
@@ -5018,6 +5028,14 @@
         "locate-path": "^3.0.0"
       }
     },
+    "flatten-vertex-data": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz",
+      "integrity": "sha512-BvCBFK2NZqerFTdMDgqfHBwxYWnxeCkwONsw6PvBMcUXqo8U/KDWwmXhqx1x2kLIg7DqIsJfOaJFOmlua3Lxuw==",
+      "requires": {
+        "dtype": "^2.0.0"
+      }
+    },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.1.1.tgz",
@@ -6535,6 +6553,11 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
+    "is-base64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-base64/-/is-base64-0.1.0.tgz",
+      "integrity": "sha512-WRRyllsGXJM7ZN7gPTCCQ/6wNPTRDwiWdPK66l5sJzcU/oOzcIcRRf0Rux8bkpox/1yjt0F6VJRsQOIG2qz5sg=="
+    },
     "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
@@ -6544,6 +6567,11 @@
         "binary-extensions": "^1.0.0"
       }
     },
+    "is-blob": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-blob/-/is-blob-2.1.0.tgz",
+      "integrity": "sha512-SZ/fTft5eUhQM6oF/ZaASFDEdbFVe89Imltn9uZr03wdKMcWNVYSMjQPFtg05QuNkt5l5c135ElvXEQG0rk4tw=="
+    },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz",
@@ -10632,6 +10660,15 @@
         }
       }
     },
+    "string-to-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-to-arraybuffer/-/string-to-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-DaGZidzi93dwjQen5I2osxR9ERS/R7B1PFyufNMnzhj+fmlDQAc1DSDIJVJhgI8Oq221efIMbABUBdPHDRt43Q==",
+      "requires": {
+        "atob-lite": "^2.0.0",
+        "is-base64": "^0.1.0"
+      }
+    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz",
@@ -10848,6 +10885,11 @@
         "worker-farm": "^1.7.0"
       }
     },
+    "text-encoding": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz",
+      "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA=="
+    },
     "thenify": {
       "version": "3.3.0",
       "resolved": "https://registry.npm.taobao.org/thenify/download/thenify-3.3.0.tgz",
@@ -10908,6 +10950,16 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "to-array-buffer": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/to-array-buffer/-/to-array-buffer-3.2.0.tgz",
+      "integrity": "sha512-zN33mwi0gpL+7xW1ITLfJ48CEj6ZQW0ZAP0MU+2W3kEY0PAIncyuxmD4OqkUVhPAbTP7amq9j/iwvZKYS+lzSQ==",
+      "requires": {
+        "flatten-vertex-data": "^1.0.2",
+        "is-blob": "^2.0.1",
+        "string-to-arraybuffer": "^1.0.0"
+      }
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz",

ghsApp/src/pagesClient/member/detail.vue

@@ -63,17 +63,17 @@
               <div class="tui-title">历史帐单</div>
             </tui-list-cell>
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">允许欠款</div>
+              <div class="tui-title">拉黑</div>
               <div class="switch_bx">
                 <text></text>
-                <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" style="transform: scale(0.8,0.8)" />
+                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
               </div>
             </tui-list-cell>
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">拉黑</div>
+              <div class="tui-title">允许欠款</div>
               <div class="switch_bx">
                 <text></text>
-                <switch :checked="form.black == 1 ? false : true" @change="blackChangeFn" style="transform: scale(0.8,0.8)" />
+                <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" style="transform: scale(0.8,0.8)" />
               </div>
             </tui-list-cell>
 						<tui-list-cell class="line-cell" :hover="false" v-if="form.debt == 1">

hdApp/src/admin/home/me.vue

@@ -73,6 +73,14 @@
           </button>
         </view>
         <view class="module-com content_box user-open_bx">
+          <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/shopYeChange' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">余额明细</div>
+          </tui-list-cell>
           <view class="input-line-wrap">
             <tui-list-cell
               @click="pageTo({ url: '/pagesStore/me/withdraw' })"

hdApp/src/api/shop-ye-change/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const changeList = data => {
+	return https.get('/shop-ye-change/list', data)
+}

hdApp/src/pages.json

@@ -230,6 +230,12 @@
 		{
 			"root": "pagesStore",
 			"pages": [
+				{
+					"path": "me/shopYeChange",
+					"style": {
+						"navigationBarTitleText": "余额明细"
+					}
+				},
 				{
 					"path": "me/withdraw",
 					"style": {

hdApp/src/pagesStore/me/shopYeChange.vue

@@ -0,0 +1,113 @@
+<template>
+	<div>
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
+						{{ item.name }}
+					</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list.data" :key="index">
+					<t-td
+						v-for="(column, colIndex) in columns"
+						:key="colIndex"
+						:align="column.align"
+						:color="column.color"
+					>
+						<view>
+							{{ item[column.dataIndex] || "" }}
+						</view>
+					</t-td>
+				</t-tr>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+    <!-- <kd-entrance></kd-entrance> -->
+	</div>
+</template>
+
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { changeList } from '@/api/shop-ye-change'
+import list from '@/mixins/list'
+export default {
+	name: "cashList",//余额变动记录
+	components: {
+		AppWrapperEmpty
+	},
+	mixins:[list],
+	data() {
+		return {
+			columns: [
+				{
+					name: "事项",
+					dataIndex: "event",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "金额",
+					dataIndex: "amount",
+					color: "info",
+					align: "center"
+				},
+				{
+					name: "余额",
+					dataIndex: "txBalance",
+					color: "info",
+					align: "center"
+				}
+			],
+		};
+	},
+	methods: {
+		async init(){
+			uni.showLoading({
+                    title: '加载中'
+                });
+			try {
+				const res = await changeList({
+					page:this.list.page,tx:2
+				})
+
+				if (this.$util.isEmpty(res.data.list)){
+					this.completes(res)
+					return
+				}
+
+
+				let currentList = res.data.list
+
+				currentList.forEach(function(item,index,array){
+
+					array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
+
+				});
+				res.data.list = currentList
+
+			   this.completes(res)
+              } finally {
+                 uni.hideLoading(); 
+              }
+		}
+	},
+	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>