零售做账

hdApp/src/pagesStore/me/shopYeChange.vue

@@ -3,14 +3,18 @@
 		<block v-if="!$util.isEmpty(list.data)">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
-					<t-th>事项</t-th>
+					<t-th>时间</t-th>
+					<t-th><view style="width:130upx;">事项</view></t-th>
+					<t-th>来源</t-th>
 					<t-th>金额</t-th>
-					<t-th>可提现余额</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>
-						<t-td align="center" color="info"><view style="width:200upx;">{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
+						<t-td align="center" color="info"><view style="width:130upx;">{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.fromType ==1 ? '门店' : item.fromType == 2 ? '商城' : item.fromType ==3 ? '朋友圈' : '其它' }}</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>
@@ -23,7 +27,6 @@
 		</block>
 	</div>
 </template>
-
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { changeList } from '@/api/shop-ye-change'

mallApp/src/pages/pay/index.vue

@@ -141,14 +141,6 @@
 				this.specialInit();
 			},
 			specialInit() {
-				// #ifdef H5
-				// 微信二次分享
-				let href = window.location.href
-				if (href.indexOf('from=singlemessage') > 0) {
-					location.href = `${this.$constant.formal}/#/pages/pay/index${this.$util.parse(this.option)}`
-					return false
-				}
-				// #endif
 				if (this.option.pageType) {
 					this.tabIndex = parseInt(this.option.pageType)
 				}
@@ -157,21 +149,20 @@
 					uni.setNavigationBarTitle({
 						title: `向【${res.shop.showName}】付款`
 					})
-
 					this.$refs.couponSel._getUserDiscount().then(status => {
 						this.discountArr = status
 					})
-
 					// 设置分享
 					let shareParams = {
 						title: `点我付款`, // 分享标题
 						desc: '享随机优惠，最高20元', // 分享内容
 						imgUrl: '',
-						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&sourceType=3`
+						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`
 					}
                     // #ifdef MP-WEIXIN
 					this.jweixinFn(shareParams)
                     // #endif
+					console.log(`/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`)
 				})
 			},
 			_pay() {
@@ -205,9 +196,7 @@
 					if (this.option.store) {
 						params.store = this.option.store
 					}
-					if (this.option.sourceType) {
-						params.sourceType = this.option.sourceType
-					}
+					params.fromType = this.option.fromType || 1
 					if (!this.$util.isEmpty(this.discountArr)) {
 						params.couponId = this.$refs.couponSel.couponId
 					}