2020.04.30

App.vue

@@ -4,6 +4,9 @@
 			console.log('App Launch')
 			uni.toast = (...args) => uni.showToast({ duration: 5678, title: args[0], icon: 'none' })
 			uni.loading = () => uni.showLoading({ mask: false })
+			if (location.hash.length > 3) {
+				uni.reLaunch({ url: 'pages/index/index' })
+			}
 		},
 		onShow: function() {
 			console.log('App Show')

apis/fortune.js

@@ -9,3 +9,5 @@ export const _API_FortuneRecordOrder = data => request.get('/inventory/record',
 export const _API_FortuneRecordRecord = data => request.get('/inventory/record_his', data) // 零售录单历史记录 接口
 
 export const _API_FortuneReward = data => request.get('/income/detail', data) // 奖励收入/支出详情 接口
+
+export const _API_PurseRunning = data => request.get('/user/user_pay_log', data) // 获取钱包流水

apis/good.js

@@ -1,6 +1,6 @@
 import request from '@/common/util/request'
 
 // export const _API_GoodList = data => request.get('/goods/list', data) // 获取商品列别接口
-export const _API_GoodList = data => request.get('/goods/list1', data) // 获取商品列别接口
+export const _API_GoodList = data => request.get('/good_show', data) // 获取商品列别接口
 
 export const _API_GoodDetail = data => request.get('/goods/detail', data) // 获取商品详情接口

apis/order.js

@@ -2,19 +2,20 @@ import request from '@/common/util/request'
 
 export const _API_OrderChart = data => request.get('/app/chart?type=0', data) // 获取 订单管理 图表数据接口
 
-export const _API_OrderPay = data => request.get('/order/pay', data) // 我的订单-待审核
+export const _API_OrderPay = data => request.get('/pay_order', data) // 支付订单
+export const _API_OrderCancel = data => request.get('/destory', data) // 取消订单
+export const _API_OrderLog = data => request.get('/get_log', data) // 订单日志
 
 
 export const _API_OrderMyExamine = data => request.get('/order/my_order?status=0', data) // 我的订单-待审核
 export const _API_OrderMySended = data => request.get('/order/my_order?status=1', data) // 我的订单-已发货
 export const _API_OrderMyCompleted = data => request.get('/order/my_order?status=2', data) // 我的订单-已完成
 
-export const _API_OrderMy1 = data => request.get('/order/my_order1?status=0', data) // 我的订单-全部
-export const _API_OrderMy2 = data => request.get('/order/my_order1?status=1', data) // 我的订单-待付款
-export const _API_OrderMy3 = data => request.get('/order/my_order1?status=2', data) // 我的订单-待审核
-export const _API_OrderMy4 = data => request.get('/order/my_order1?status=3', data) // 我的订单-待收货
-export const _API_OrderMy5 = data => request.get('/order/my_order1?status=4', data) // 我的订单-已完成
-
+export const _API_OrderMy1 = data => request.get('/order_list?status=0', data) // 我的订单-全部
+export const _API_OrderMy2 = data => request.get('/order_list?status=1', data) // 我的订单-待付款
+export const _API_OrderMy3 = data => request.get('/order_list?status=2', data) // 我的订单-待审核
+export const _API_OrderMy4 = data => request.get('/order_list?status=3', data) // 我的订单-待收货
+export const _API_OrderMy5 = data => request.get('/order_list?status=4', data) // 我的订单-已完成
 
 export const _API_OrderDownWillpay = data => request.get('/order/order_lower?status=0', data) // 下级订单-待付款
 export const _API_OrderDownWillsend = data => request.get('/order/order_lower?status=1', data) // 下级订单-待发货
@@ -23,7 +24,8 @@ export const _API_OrderDownForward = data => request.get('/order/order_turn', da
 export const _API_OrderDownCompleted = data => request.get('/order/order_lower?status=3', data) // 下级订单-已完成
 
 
-export const _API_PlaceOrder = data => request.post('/order/submit_order', data) // 订货下单
+// export const _API_PlaceOrder = data => request.post('/order/submit_order', data) // 订货下单
+export const _API_PlaceOrder = data => request.post('/submit_order', data) // 订货下单
 
 
 export const _API_OrderReceiveGoods = data => request.get('/order/order_complete', data) // 确认收货
@@ -36,7 +38,7 @@ export const _API_OrderDel = data => request.get('/order/del', data) // 删除
 
 
 export const _API_OrderDetail = data => request.get('/order/detail', data) // 获取订单详情
-export const _API_OrderDetail1 = data => request.get('/order/detail1', data) // 获取订单详情
+export const _API_OrderDetail1 = data => request.get('/order_detail', data) // 获取订单详情
 
 
 export const _API_OrderSend = data => request.post('/order/forward', data) // 发货/转单

common/util/request.js

@@ -3,11 +3,13 @@ import $store from '@/store'
 import uni_request from './uni_request.js'
 
 // const host = 'http://api.app.jiuweiyun.cn'
-const host = 'http://192.168.0.11'
+const host = 'http://api.woaidakele.cn'
+// const host = 'http://192.168.0.4'
+// const host = 'http://192.168.0.11'
 const port = 80
 // const port = 443
-const url = '/dwbsapp'
-// const url = '/api'
+// const url = '/dwbsapp'
+const url = '/api'
 
 // uni.onNetworkStatusChange(res => { $store.commit('device/NETWORKTYPE_CHANGE', res.networkType) }) // 网络类型变化监听
 // uni.getNetworkType({ success(res) { $store.commit('device/NETWORKTYPE_CHANGE', res.networkType) }}) // 获取网络类型

index.html

@@ -21,7 +21,7 @@
 				font-size: 24px!important;
 				width: 65vw!important;
 			}
-			.uni-modal__btn_primary {
+			.uni-modal__btn_primary, .uni-picker-action-confirm {
 				color: #F76454!important;
 			}
 		</style>

manifest.json

@@ -83,7 +83,7 @@
             }
         },
         "title" : "大卫博士公众号",
-        "domain" : "http://api.app.jiuweiyun.cn",
+        "domain" : "http://api.woaidakele.cn",
         "devServer" : {
             "https" : false
         },

pages.json

@@ -2,7 +2,7 @@
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
         {
             "path" : "pages/index/index",
-            "style": { "navigationBarTitleText": "首页" }
+            "style": { "navigationBarTitleText": "首页", "enablePullDownRefresh": true }
         },
 		{
 		    "path" : "pages/index-my/index-my",
@@ -200,6 +200,14 @@
             "path" : "pages/order-detail1-log/order-detail1-log",
             "style": { "navigationBarTitleText": "操作日志" }
         }
+        ,{
+            "path" : "pages/money-running/money-running",
+            "style": { "navigationBarTitleText": "钱包余额" }
+        }
+        ,{
+            "path" : "pages/money-running-detail/money-running-detail",
+            "style": { "navigationBarTitleText": "账单详情" }
+        }
     ],
 	"tabBar": {
 		"color": "#666666",

pages/comfirm-order-success/comfirm-order-success.vue

@@ -6,7 +6,7 @@
 		<text class="t3">应付金额:￥{{ money }}.00</text>
 		<view class="btn">
 			<navigator open-type="navigateBack" class="big-btn">返回</navigator>
-			<navigator :url="'../pay-order/pay-order?fromS=1&order_num=' + order_num + '&money=' + money"  class="big-btn bg">付款</navigator>
+			<navigator :url="'../pay-order/pay-order?fromS=1&order_id=' + order_id + '&money=' + money + '&order_num=' + order_num"  class="big-btn bg">付款</navigator>
 		</view>
 	</view>
 </template>
@@ -16,11 +16,13 @@
 		data() {
 			return {
 				order_num: '',
-				money: ''
+				money: '',
+				order_id: ''
 			}
 		},
-		onLoad({ order_num, money }) {
+		onLoad({ order_num, money, order_id }) {
 			this.order_num = order_num
+			this.order_id = order_id
 			this.money = money
 		}
 	}

pages/confirm-order1/confirm-order1.vue

@@ -111,10 +111,10 @@
 									})
 								})
 								this.$store.commit('cart/CLEAREMPTYITEM')
-								uni.redirectTo({ url: `../comfirm-order-success/comfirm-order-success?order_num=${res.data.order_num}&money=${money}` })
+								uni.redirectTo({ url: `../comfirm-order-success/comfirm-order-success?order_id=${res.data.order_id}&order_num=${res.data.order_num}&money=${money}` })
 							} else {
 								this.requesting = false
-								uni.toast('下单失败，请稍后重试')
+								uni.toast(res.message)
 							}
 						}).catch(() => his.requesting = false)
 					}

pages/good-detail1/good-detail1.vue

@@ -48,7 +48,7 @@
 			shopcarNum() { return this.$store.getters['cart/shopcarNum'] },
 		},
 		onLoad({ data }) {
-			this.data = JSON.parse(data)
+			this.data = JSON.parse(uni.getStorageSync('ggg'))
 			if (!this.data.banner_img.length) {
 				this.data.banner_img = [this.data.main_img]
 			}

pages/index-my/index-my.vue

@@ -44,6 +44,10 @@
 					</navigator>
 				</view>
 			</view>
+			<navigator url="../money-running/money-running" class="money">
+				<view class="left">账户余额：<text class="basecolor">￥{{ money | numDot }}</text></view>
+				<view class="right">详情 <text class="cuIcon-right"></text></view>
+			</navigator>
 			<!-- <navigator url="../../pages/proxy-updata/proxy-updata" class="card">
 				<image src="../../static/index/my/user-up.png"></image>
 			</navigator> -->
@@ -119,7 +123,8 @@
 		computed: {
 			userinfo() { return this.$store.state.userinfo },
 			logged() { return this.$store.state.app.token ? true : false },
-			messageNum() { return this.$store.getters['message/messageNum'] }
+			messageNum() { return this.$store.getters['message/messageNum'] },
+			money() { return this.$store.state.userinfo.money }
 		},
 		methods: {
 			toActive(index) {
@@ -171,6 +176,24 @@
 					height: 100%;
 				}
 			}
+			.money {
+				height: 148rpx;
+				padding: 0 30rpx;
+				background: #FFFFFF;
+				margin-top: 10rpx;
+				box-sizing: border-box;
+				@include flex();
+				justify-content: space-between;
+				font-size: 32rpx;
+				> .left {
+					.basecolor {
+						font-size: 54rpx;
+					}
+				}
+				.right {
+					color: #B7B7B7;
+				}
+			}
 			.area {
 				background: #FFFFFF;
 				&.info {

pages/index/index.vue

@@ -118,11 +118,45 @@
 		},
 		mounted() { // 页面创建后判断用户状态
 			uni.$on('RELAUNCH', () => uni.reLaunch({ url: '../login-psw/login-psw' })) // 监听 token 失效事件，跳转到登录页
+			uni.$on('INIT', () => this.init())
 			if (this.$store.state.app.token) { // 当用户处于登陆状态
 				if (window.location.pathname.split('/').length > 4) {
 					window.history.replaceState({}, '', '/api/gzh')
 				}
 				uni.showLoading({ mask: true })
+				this.init()
+			} else {
+				if (window.location.pathname.split('/').length > 4) {
+					uni.showLoading({ mask: true })
+					setTimeout(() => {
+						uni.hideLoading()
+						const query = window.location.pathname.split('/')
+						window.history.replaceState({}, '', '/api/gzh')
+						uni.reLaunch({ url: `../invite-proxy/invite-proxy?nickname=${query[3]}&mobile=${query[4]}&invite_code=${query[5]}` })
+					})
+				} else {
+					uni.reLaunch({ url: '../login-psw/login-psw' })
+				}
+			}
+		},
+		onPullDownRefresh() {
+			this.init()
+		},
+		methods: {
+			rTap() { uni.navigateTo({ url: '../help-use/help-use' }) }, // 点击导航栏帮助
+			toSwiperDetail(index) { // 点击轮播图
+				if (this.swiper[index].is_jump == 1) {
+					uni.navigateTo({ url: `../app-webview/app-webview?url=${this.swiper[index].url}` })
+				}
+			},
+			indexRequest() { // 请求首页数据
+				_API_IndexIndex().then(res => {
+					uni.stopPullDownRefresh()
+					this.news = res.data.news
+					this.swiper = res.data.swiper
+				})
+			},
+			init() {
 				_API_GetUserStatus().then(res => { // 获取用户状态
 					this.$store.commit('userinfo/UPDATA_USERINFO', res.data) // 获取用户状态后保存在 vuex 中
 					if (res.data.status == 1) { // 用户状态为 1 表示正常
@@ -134,6 +168,7 @@
 						} else if (res.data.cert_status == 6) { // 用户认证完成
 							this.indexRequest() // 请求首页数据
 							_API_GetUserInfo().then(res => { // 请求用户信息
+								uni.stopPullDownRefresh()
 								this.$store.commit('userinfo/UPDATA_USERINFO', res.data) // 获取用户信息后保存在 vuex 中
 								if (this.$store.state.userinfo.pass_status) {
 									uni.showModal({ title: '提示', content: '为了保障您的账户安全，请立即修改密码', showCancel: false, success: res => {
@@ -152,33 +187,6 @@
 						})
 					}
 				})
-			} else {
-				if (window.location.pathname.split('/').length > 4) {
-					uni.showLoading({ mask: true })
-					setTimeout(() => {
-						uni.hideLoading()
-						const query = window.location.pathname.split('/')
-						window.history.replaceState({}, '', '/api/gzh')
-						uni.reLaunch({ url: `../invite-proxy/invite-proxy?nickname=${query[3]}&mobile=${query[4]}&invite_code=${query[5]}` })
-					})
-				} else {
-					uni.reLaunch({ url: '../login-psw/login-psw' })
-				}
-			}
-		},
-		methods: {
-			rTap() { uni.navigateTo({ url: '../help-use/help-use' }) }, // 点击导航栏帮助
-			toSwiperDetail(index) { // 点击轮播图
-				if (this.swiper[index].is_jump == 1) {
-					uni.navigateTo({ url: `../app-webview/app-webview?url=${this.swiper[index].url}` })
-				}
-			},
-			indexRequest() { // 请求首页数据
-				_API_IndexIndex().then(res => {
-					uni.stopPullDownRefresh()
-					this.news = res.data.news
-					this.swiper = res.data.swiper
-				})
 			}
 		}
 	}

pages/money-running-detail/money-running-detail.vue

@@ -0,0 +1,59 @@
+<template>
+	<view class="money-running-detail">
+		<view class="app-item">
+			<text>金额</text>
+			<text>{{ info.pay_money }}</text>
+		</view>
+		<view class="app-item">
+			<text>摘要</text>
+			<text>{{ info.type | getRunningStatus }}</text>
+		</view>
+		<view class="app-item">
+			<text>订单号</text>
+			<text>{{ info.order_num }}</text>
+		</view>
+		<view class="app-item">
+			<text>时间</text>
+			<text>{{ info.updated_at }}</text>
+		</view>
+		<view class="app-item">
+			<text>备注</text>
+			<text>{{ info.remark }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: {}
+			};
+		},
+		filters: {
+			getRunningStatus(status) {
+				switch (status.toString()) {
+					case '0': 
+						return '账户充值'
+					case '1':
+						return '购买商品'
+					case '2':
+						return '订单退款'
+					default:
+						return ''
+				}
+			}
+		},
+		onLoad({ key }) {
+			this.info = JSON.parse(uni.getStorageSync(key))
+			uni.removeStorageSync(key)
+		}
+	}
+</script>
+
+<style lang="scss">
+	.money-running-detail {
+		height: 100vh;
+		background: $app-base-bg;
+	}
+</style>

pages/money-running/money-running.vue

@@ -0,0 +1,157 @@
+<template>
+	<view class="money-running">
+		<view class="money">
+			<text>资金余额</text>
+			<text class="num">￥{{ money }}.00</text>
+		</view>
+		<view class="picker">
+			<picker mode="date" fields="month" :value="date" :end="end" @change="bindDateChange">
+				<view class="uni-input">{{ date.split('-')[0] }}{{ ' - ' }}{{ date.split('-')[1] }}{{ '  >' }}</view>
+			</picker>
+		</view>
+		<view v-if="list.length" class="list">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="left">
+					<image src="../../static/icon/money.png" ></image>
+					<view>
+						<text>{{ item.type | getRunningStatus }}</text>
+						<text class="time">{{ item.updated_at }}</text>
+					</view>
+				</view>
+				<view class="rihgt" :class="{ basecolor: item.type != 1 }">{{ item.type == 1 ? '- ' : '+ ' }}{{ item.pay_money }}</view>
+			</view>
+		</view>
+		<view v-else class="no">暂无流水</view>
+	</view>
+</template>
+
+<script>
+	import { _API_PurseRunning } from '@/apis/fortune.js'
+	export default {
+		data() {
+			return {
+				end: this.getDate({ format: true }),
+				date: this.getDate({ format: true }),
+				list: []
+			};
+		},
+		filters: {
+			getRunningStatus(status) {
+				switch (status.toString()) {
+					case '0': 
+						return '账户充值'
+					case '1':
+						return '购买商品'
+					case '2':
+						return '订单退款'
+					default:
+						return ''
+				}
+			}
+		},
+		computed: {
+			money() { return this.$store.state.userinfo.money },
+			timestamp() {
+				return +(new Date(`${this.date.split('-')[0]}-${this.date.split('-')[1]}-01`)) / 1000 - 60 * 60 * 8
+			}
+		},
+		mounted() {
+			this.request()
+		},
+		methods: {
+			request() {
+				uni.loading()
+				_API_PurseRunning({ time: this.timestamp }).then(({ data: { list } }) => {
+					this.list = list
+				})
+			},
+			getDate(type) {
+				const date = new Date()
+				let year = date.getFullYear()
+				let month = date.getMonth() + 1
+				let day = date.getDate()
+				month = month > 9 ? month : '0' + month
+				day = day > 9 ? day : '0' + day
+				return `${year}-${month}-${day}`
+			},
+			bindDateChange(e) {
+				this.date = e.target.value
+				setTimeout(() => this.request())
+			},
+			detail(item) {
+				const key = Date.now().toString()
+				uni.setStorageSync(key, JSON.stringify(item))
+				uni.navigateTo({ url: `../money-running-detail/money-running-detail?key=${key}` })
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.money-running {
+		height: 100vh;
+		@include flex(column);
+		background: $app-base-bg;
+		justify-content: flex-start;
+		.money {
+			@include flex(column);
+			color: #FFFFFF;
+			font-size: 36rpx;
+			width: 100%;
+			height: 200rpx;
+			background:linear-gradient(-59deg,rgba(247,115,84,1) 0%,rgba(249,162,114,1) 100%);
+			.num {
+				font-size: 60rpx;
+			}
+		}
+		.picker {
+			width: 100%;
+			height: 98rpx;
+			margin: 10rpx 0;
+			background: #FFFFFF;
+			picker {
+				@include flex();
+				height: 100%;
+			}
+		}
+		.no {
+			flex: 1;
+			width: 100%;
+			@include flex();
+		}
+		.list {
+			flex: 1;
+			width: 100%;
+			overflow: auto;
+			.item {
+				height: 90rpx;
+				background: #FFFFFF;
+				margin-bottom: 1rpx;
+				box-sizing: border-box;
+				padding: 13rpx 30rpx;
+				@include flex();
+				justify-content: space-between;
+				font-size: 32rpx;
+				.left {
+					@include flex();
+					> view {
+						@include flex(column);
+						align-items: flex-start;
+						margin-left: 16rpx;
+						text {
+							font-size: 28rpx;
+							&.time {
+								font-size: 24rpx;
+								color: #666666;
+							}
+						}
+					}
+					image {
+						width: 64rpx;
+						height: 64rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/my-order/my-order.vue

@@ -13,7 +13,7 @@
 							<view class="order-item" v-for="(orderItem) in lists[typeKey]" :key="orderItem.order_num" @click="toDetail(orderItem)">
 								<view class="order-num">
 									<text>订单编号：{{ orderItem.order_num }}</text>
-									<text :class="orderItem | orderStatus | orderStatusClass">{{ orderItem | orderStatus }}</text>
+									<text class="fsdfsd" :class="orderItem | orderStatus | orderStatusClass">{{ orderItem | orderStatus }}</text>
 								</view>
 								<view class="good-item">
 									<view class="imgs">
@@ -50,7 +50,7 @@
 	import pulldownRefresher from '@/components/public/pulldown-refresher.vue'
 	import customReachBottom from '@/components/public/custom-reach-bottom.vue'
 	// import { _API_OrderMyExamine, _API_OrderMySended, _API_OrderMyCompleted, _API_OrderReceiveGoods } from '@/apis/order.js'
-	import { _API_OrderMy1, _API_OrderMy2, _API_OrderMy3, _API_OrderMy4, _API_OrderMy5, _API_OrderAgain, _API_OrderDel, _API_OrderDetail1 } from '@/apis/order.js'
+	import { _API_OrderMy1, _API_OrderMy2, _API_OrderMy3, _API_OrderMy4, _API_OrderMy5, _API_OrderAgain, _API_OrderDel, _API_OrderDetail1, _API_OrderCancel } from '@/apis/order.js'
 	export default {
 		mixins: [MIXIN],
 		components: { swiperStatus, customReachBottom, pulldownRefresher },
@@ -160,16 +160,24 @@
 								uni.loading()
 								list1.forEach(e => e.cart = Array(e.size.length).fill(0))
 								_API_OrderDetail1({ order_num }).then(({ data: { list: list2 } }) => {
-									// uni.loading()
+									uni.loading()
+									this.$store.commit('cart/CLEAR')
 									list1.forEach((item, index) => {
-										if (item.id == list2[index].id) {
-											list2[index].size.forEach((size, sizeIndex) => {
+										const findRes = list2.find(e => e.attr_id == item.attr_id)
+										if (findRes) {
+											findRes.size.forEach((size, sizeIndex) => {
 												const goodItemSizeIndex = list1[index].size.findIndex(e => e === size)
-												list1[index].cart[goodItemSizeIndex] = list2[index].num[sizeIndex]
+												list1[index].cart[goodItemSizeIndex] = findRes.num[sizeIndex]
 											})
 											item.choosed = true
 											item.sizeChoosed = Array(item.size.length).fill(true)
 											this.$store.commit('cart/ADD', item)
+											uni.switchTab({ url: '../shop-car1/shop-car1' })
+										}
+									})
+									_API_OrderCancel({ order_num }).then(({ code, message }) => {
+										if (code != 200) {
+											uni.toast(message)
 										}
 									})
 								})
@@ -185,8 +193,25 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.loading()
-							_API_OrderAgain({ order_num }).then(({ data: { order_num } }) => {
-								uni.navigateTo({ url: `../comfirm-order-success/comfirm-order-success?order_num=${order_num}&money=${money}` })
+							_API_GoodList().then(({ data: { list: list1 } }) => {
+								uni.loading()
+								list1.forEach(e => e.cart = Array(e.size.length).fill(0))
+								_API_OrderDetail1({ order_num }).then(({ data: { list: list2 } }) => {
+									this.$store.commit('cart/CLEAR')
+									list1.forEach((item, index) => {
+										const findRes = list2.find(e => e.attr_id == item.attr_id)
+										if (findRes) {
+											findRes.size.forEach((size, sizeIndex) => {
+												const goodItemSizeIndex = list1[index].size.findIndex(e => e === size)
+												list1[index].cart[goodItemSizeIndex] = findRes.num[sizeIndex]
+											})
+											item.choosed = true
+											item.sizeChoosed = Array(item.size.length).fill(true)
+											this.$store.commit('cart/ADD', item)
+											uni.switchTab({ url: '../shop-car1/shop-car1' })
+										}
+									})
+								})
 							})
 						}
 					}

pages/order-detail1-log/order-detail1-log.vue

@@ -1,19 +1,60 @@
 <template>
-	<view>
-		
+	<view class="order-detail1-log" v-if="list.length">
+		<view class="item" v-for="(item, index) in list" :key="index">
+			<view class="message">{{ item.log_text }}</view>
+			<view class="time">
+				<text>{{ item.log_name }}</text>
+				<text>{{ item.created_at }}</text>
+			</view>
+		</view>
 	</view>
+	<view class="nomore" v-else>暂无操作日志</view>
 </template>
 
 <script>
+	import { _API_OrderLog } from '@/apis/order.js'
 	export default {
 		data() {
 			return {
-				
+				list: []
 			};
+		},
+		onLoad({ order_num }) {
+			uni.loading()
+			_API_OrderLog({ order_num }).then(({ data: { list } }) => {
+				this.list = list
+			})
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+	.nomore {
+		height: 100vh;
+		@include flex();
+		background: $app-base-bg;
+	}
+	.order-detail1-log {
+		height: 100vh;
+		overflow: hidden;
+		background: $app-base-bg;
+		.item {
+			margin-bottom: 10rpx;
+			.message {
+				padding: 10rpx 30rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-bottom: 2rpx;
+				background: #FFFFFF;
+			}
+			.time {
+				@include flex();
+				box-sizing: border-box;
+				padding: 0 30rpx;
+				height: 78rpx;
+				justify-content: space-between;
+				background: #FFFFFF;
+			}
+		}
+	}
 </style>

pages/order-detail1/order-detail1.vue

@@ -1,17 +1,13 @@
 <template>
 	<view class="order-detail1">
 		<view url="../address-manage/address-manage?choose=1" class="address">
-			<view v-if="address" class="address-info">
+			<view class="address-info">
 				<view class="top">
 					<text class="name">收货人：{{ address.con_name }}</text>
 					<text class="phone">{{ address.con_mobile }}</text>
 				</view>
 				<view class="detail ellipsis">{{ address | getAddressString }}</view>
 			</view>
-			<view v-else class="choose">
-				<text class="add">+</text>
-				<text class="text">添加收货人</text>
-			</view>
 			<text class="cuIcon-right"></text>
 		</view>
 		<view class="border">
@@ -28,7 +24,7 @@
 				<view class="info">
 					<text>尺码：{{ item.size.length }}</text>
 					<text>数量：{{ item.num.reduce((t, e) => t + e, 0) }}</text>
-					<text>共计金额：<text class="basecolor">￥{{ item.money }}.00</text></text>
+					<text>共计金额：<text class="basecolor">￥{{ item.money * item.num.reduce((t, e) => t + e, 0) }}.00</text></text>
 				</view>
 			</view>
 		</view>
@@ -53,10 +49,10 @@
 			<text>备注信息</text>
 			<text class="cuIcon-right"></text>
 		</view>
-		<view class="app-item">
+		<navigator :url="'../order-detail1-log/order-detail1-log?order_num=' + order_num" class="app-item">
 			<text>操作日志</text>
 			<text class="cuIcon-right"></text>
-		</view>
+		</navigator>
 		<view class="submit">
 			<view class="left">催办</view>
 			<view v-if="nopay" class="center">订单作废</view>

pages/pay-order/pay-order.vue

@@ -19,6 +19,7 @@
 		data() {
 			return {
 				order_num: '',
+				order_id: '',
 				money: '',
 				fromS: ''
 			}
@@ -28,8 +29,9 @@
 				return this.$store.state.userinfo.money
 			}
 		},
-		onLoad({ order_num, money, fromS }) {
+		onLoad({ order_id, money, fromS, order_num }) {
 			this.order_num = order_num
+			this.order_id = order_id
 			this.money = money
 			this.fromS = fromS
 		},
@@ -39,9 +41,10 @@
 					uni.toast('您的余额不足，无法付款')
 				} else {
 					uni.loading()
-					_API_OrderPay({ order_num: this.order_num }).then(({ code, message }) => {
+					_API_OrderPay({ order_id: this.order_id }).then(({ code, message }) => {
 						if (code == 200) {
 							this.$store.commit('userinfo/REDUCEMONEY', this.money)
+							uni.$emit('INIT')
 							uni.$emit('PAYSUCCESS', this.order_num)
 							uni.showModal({
 								showCancel: false,

pages/place-order/place-order.vue

@@ -49,7 +49,7 @@
 				const temp = deepClone(this.goodsList)
 				temp.forEach(goodItem => {
 					goodItem.cart = Array(goodItem.size.length).fill(0)
-					const itemInCart = this.$store.state.cart.list.find(e => e.id === goodItem.id)
+					const itemInCart = this.$store.state.cart.list.find(e => e.attr_id === goodItem.attr_id)
 					if (itemInCart) {
 						Object.assign(goodItem, itemInCart)
 					}
@@ -81,7 +81,8 @@
 				// if (this.$store.state.userinfo.level === '销售主管') {
 				// 	uni.toast('销售主管不能通过App下单')
 				// } else {
-				uni.navigateTo({ url: `../good-detail1/good-detail1?data=${JSON.stringify(this.goodsList[index])}` })
+				uni.setStorageSync('ggg', JSON.stringify(this.goodsList[index]))
+				uni.navigateTo({ url: `../good-detail1/good-detail1` })
 				// }
 				// console.log()
 			},

pages/shop-car1/shop-car1.vue

@@ -3,9 +3,12 @@
 		<view v-if="list.length" class="list">
 			<view class="shopcar-item" v-for="(item, index) in list" :key="index">
 				<view class="name" @tap="chooseGood(!item.choosed, index)">
-					<text v-if="item.choosed" class="cuIcon-roundcheckfill"></text>
-					<text v-else class="cuIcon-round"></text>
-					<view class="name ellipsis">{{ item.name }}</view>
+					<view class="left">
+						<text v-if="item.choosed" class="cuIcon-roundcheckfill"></text>
+						<text v-else class="cuIcon-round"></text>
+						<view class="name ellipsis">{{ item.name }}</view>
+					</view>
+					<text class="cuIcon-delete" @click.stop="deleteGood(index)"></text>
 				</view>
 				<view class="sizeItem" v-for="(sizeItem, sizeIndex) in item.size" :key="sizeIndex" v-if="item.cart[sizeIndex]" 
 					@tap="chooseSize(!item.sizeChoosed[sizeIndex], index, sizeIndex)"
@@ -65,7 +68,7 @@
 					            this.$store.commit('cart/COUNTCHANGE', { value, index, sizeIndex, del: true })
 					        }
 					    }
-					});
+					})
 				}
 			},
 			chooseAll(to) { // 点击全选
@@ -80,6 +83,17 @@
 			goToBuy() { // 点击去下单
 				uni.navigateTo({ url: '../place-order/place-order' })
 			},
+			deleteGood(index) { // 点击删除商品
+				uni.showModal({
+				    title: '提示',
+				    content: '确定删除这件商品？',
+				    success: res => {
+				        if (res.confirm) {
+				            this.$store.commit('cart/DELETE', index)
+				        }
+				    }
+				})
+			},
 			confirm() { // 点击结算
 				if (this.choosedNum) {
 					uni.navigateTo({ url: '../confirm-order1/confirm-order1' })
@@ -101,21 +115,28 @@
 				height: 90rpx;
 				@include flex();
 				background: #FFFFFF;
-				justify-content: flex-start;
-				.name {
-					color: #181818;
-					font-size: 32rpx;
-					font-weight: bold;
-				}
-				.cuIcon-round, .cuIcon-roundcheckfill {
+				justify-content: space-between;
+				.left {
 					@include flex();
-					width: 102rpx;
-					height: 100%;
-					font-size: 32rpx;
-					&.cuIcon-roundcheckfill {
-						color: $app-base-color;
+					> .name {
+						color: #181818;
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+					.cuIcon-round, .cuIcon-roundcheckfill {
+						@include flex();
+						width: 102rpx;
+						height: 100%;
+						font-size: 32rpx;
+						&.cuIcon-roundcheckfill {
+							color: $app-base-color;
+						}
 					}
 				}
+				.cuIcon-delete {
+					font-size: 40rpx;
+					margin-right: 30rpx;
+				}
 			}
 			.sizeItem {
 				@include flex();

store/modules/cart.js

@@ -93,7 +93,7 @@ export default {
 	},
 	mutations: {
 		ADD(state, payload) { // 添加商品到购物车 (已存在合并,不存在添加)
-			const index = state.list.findIndex(e => e.id === payload.id) // 检查添加商品是否存在于购物车中
+			const index = state.list.findIndex(e => e.attr_id === payload.attr_id) // 检查添加商品是否存在于购物车中
 			if(index === -1) {
 				state.list.push(payload)
 			} else {
@@ -101,6 +101,14 @@ export default {
 			}
 			storage(state.list)
 		},
+		DELETE(state, payload) {
+			state.list.splice(payload, 1)
+			storage(state.list)
+		},
+		CLEAR(state) { // 清空购物车
+			state.list = []
+			storage(state.list)
+		},
 		CLEAREMPTYITEM(state) {
 			for(let i = state.list.length - 1; i >= 0; i --) {
 				if (state.list[i].cart.reduce((t, e) => t + e, 0) === 0) { // 当某个尺码数量变为 0 时,进行一波操作,删除这件商品的这个类型或者商品

unpackage/dist/build/h5/index.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>大卫博士公众号</title><script src=http://cdn.staticfile.org/jquery/2.1.1/jquery.min.js></script><script src=http://cdn.staticfile.org/jquery.qrcode/1.0/jquery.qrcode.min.js></script><script src=https://cdn.staticfile.org/pako/1.0.10/pako.min.js></script><script src=https://cdn.staticfile.org/Base64/1.0.2/base64.min.js></script><script>document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })</script><style type=text/css>.uni-simple-toast__text {
+				font-size: 24px!important;
+				width: 65vw!important;
+			}
+			.uni-modal__btn_primary, .uni-picker-action-confirm {
+				color: #F76454!important;
+			}</style><link rel=stylesheet href=/gzh/static/index.cdf7f91b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/gzh/static/js/chunk-vendors.a4254b72.js></script><script src=/gzh/static/js/index.94ca47ca.js></script></body></html>