6-2-1

api/shop.js

@@ -51,4 +51,22 @@ export function getCity(data) {
 		method: 'get',
 		data
 	})
+}
+
+//兑换
+export function goDh(data) {
+	return request({
+		url: '/api/exchange',
+		method: 'post',
+		data
+	})
 }
+
+//转赠
+export function gozz(data) {
+	return request({
+		url: '/api/donation',
+		method: 'post',
+		data
+	})
+}

components/lee-select-city/city.json

@@ -3511,7 +3511,7 @@
 		"latter": "H"
 	},
 	{
-		"name": "上海市",
+		"name": "上海",
 		"latter": "S",
 		"children": [
 			{

components/lee-select-city/hot-cities.json

@@ -1,6 +1,6 @@
-[
+[["台州",["浙江省","台州市"]],
 	["北京", ["北京市"]],
-	["上海", ["上海市"]],
+	["上海", ["上海"]],
 	["广州", ["广东省", "广州市"]],
 	["深圳", ["广东省", "深圳市"]],
 	["杭州", ["浙江省", "杭州市"]],

main.js

@@ -20,6 +20,13 @@ const msg = (title, duration=1500, mask=false, icon='none')=>{
 		mask,
 		icon
 	});
+}
+
+const showOk = (title) => {
+	uni.showToast({
+		title: title,
+		duration: 2000
+	});
 }
 
 const prePage = ()=>{
@@ -36,7 +43,7 @@ const prePage = ()=>{
 Vue.config.productionTip = false
 Vue.prototype.$fire = new Vue();
 Vue.prototype.$store = store;
-Vue.prototype.$api = {msg, prePage};
+Vue.prototype.$api = {msg, prePage,showOk};
 
 App.mpType = 'app'
 

pages/order/order.vue

@@ -57,6 +57,8 @@
 								class="action-btn recom">立即支付</button>
 							<button v-if="item._status._title == '待评价'" class="action-btn"
 								@click.stop="sy(item)">使用</button>
+							<button v-if="tabCurrentIndex == 1" class="action-btn"
+									@click.stop="openDh(item)">转赠</button>
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)"
 								class="action-btn">确认收货</button>
 							<!-- 							<button v-if="item._status._title == '未发货' && item.is_gift != 1" class="action-btn"
@@ -68,12 +70,29 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<uni-popup ref="popupdh" class="agree-wrapper">
+			<view class="hx-wrapper">
+				<view class="hx-img">
+					<image src="../../static/img/hxbg.png" mode=""></image>
+				</view>
+				<view class="hx-body">
+					<view class="hx-title">赠送好友</view>
+					<input type="text" v-model="zzuid" placeholder="请输入好友UID" placeholder-class="hx-placeholder" />
+					<view class="hx-btn" @click.stop="gozz()">立即赠送</view>
+				</view>
+				<view class="hx-close" @click="closeDh()">
+					<image src="../../static/icon/close.png" mode=""></image>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
+	
+	import { gozz } from '@/api/shop.js'
 	import {
 		orderList,
 		orderCancel,
@@ -92,6 +111,10 @@
 		},
 		data() {
 			return {
+				zzitem: {},
+				zzuid: '',
+				zzcode: '',
+				dhing: false,
 				tabCurrentIndex: 0,
 				navList: [{
 						state: 0,
@@ -218,6 +241,42 @@
 		},
 		// #endif
 		methods: {
+			// 打开兑换弹窗
+			openDh(item) {
+				this.zzitem = item
+				this.zzcode = item.order_id
+				this.$refs.popupdh.open()
+			},
+			// 关闭兑换弹窗
+			closeDh() {
+				this.zzcode = ''
+				this.zzuid = ''
+				this.$refs.popupdh.close()
+			},
+			// 兑换
+			gozz() {
+				let obj = this
+				if (obj.dhing) {
+					return
+				}
+				if (obj.zzuid == '') {
+					return obj.$api.msg('请输入接收人UID')
+				}
+				obj.dhing = true
+				gozz({
+					order_id: obj.zzcode,
+					uid: obj.zzuid
+				}).then(res => {
+					
+					let s = this.navList[obj.tabCurrentIndex].orderList.indexOf(obj.zzitem);
+					this.navList[obj.tabCurrentIndex].orderList.splice(s, 1);
+					obj.dhing = false
+					obj.closeDh()
+					obj.$api.showOk('赠送成功')
+				}).catch(err => {
+					obj.dhing = false
+				})
+			},
 			sy(e) {
 				console.log(e);
 				uni.navigateTo({
@@ -788,4 +847,78 @@
 			opacity: 0.2;
 		}
 	}
+	.hx-wrapper {
+		width: 536rpx;
+		height: 630rpx;
+		position: relative;
+	
+		// background-color: #fff;
+		.hx-img {
+			width: 536rpx;
+			height: 281rpx;
+	
+			image {
+				width: 536rpx;
+				height: 281rpx;
+			}
+		}
+	
+		.hx-close {
+			position: absolute;
+			left: 243rpx;
+			bottom: -80rpx;
+			width: 52rpx;
+			height: 52rpx;
+	
+			image {
+				width: 52rpx;
+				height: 52rpx;
+			}
+		}
+	
+		.hx-body {
+			width: 536rpx;
+			height: 349rpx;
+			background-color: #fff;
+			border-radius: 0 0 10rpx 10rpx;
+	
+			.hx-title {
+				width: 536rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: 1;
+				padding-top: 42rpx;
+				text-align: center;
+			}
+	
+			input {
+				width: 439rpx;
+				height: 68rpx;
+				background: #dbf3e9;
+				border-radius: 10rpx;
+				margin: 39rpx auto 0;
+				padding-left: 26rpx;
+	
+				.hx-placeholder {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #52c696;
+				}
+			}
+	
+			.hx-btn {
+				margin: 44rpx auto 0;
+				width: 353rpx;
+				height: 71rpx;
+				background: #52c696;
+				border-radius: 34rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #f8f9f9;
+				line-height: 71rpx;
+				text-align: center;
+			}
+		}
+	}
 </style>

pages/user/user.vue

@@ -54,7 +54,8 @@
 				thumb="/static/user/user2.png"></uni-list-item>
 			<uni-list-item title="我的优惠券" @click="navTo('/pages/user/myyhq')" thumb="/static/icon/g-l.png">
 			</uni-list-item>
-
+			<uni-list-item title="兑换码兑换" @click="openDh" thumb="/static/user/mybank.png" v-if="userInfo.uid">
+			</uni-list-item>
 			<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user3.png"
 				v-if="userInfo.level">
 			</uni-list-item>
@@ -100,9 +101,27 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="popupdh" class="agree-wrapper">
+			<view class="hx-wrapper">
+				<view class="hx-img">
+					<image src="../../static/img/hxbg.png" mode=""></image>
+				</view>
+				<view class="hx-body">
+					<view class="hx-title">输入礼包兑换码</view>
+					<input type="text" v-model="dhcode" placeholder="请输入兑换码" placeholder-class="hx-placeholder" />
+					<view class="hx-btn" @click.stop="goDh()">立即兑换</view>
+				</view>
+				<view class="hx-close" @click="closeDh()">
+					<image src="../../static/icon/close.png" mode=""></image>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
+	import {
+		goDh
+	} from '@/api/shop.js'
 	import {
 		tabbar1
 	} from '@/utils/tabbar.js';
@@ -137,6 +156,8 @@
 		},
 		data() {
 			return {
+				dhcode: '', //兑换码
+				dhing: false, //是否兑换中
 				code: '',
 				current: 4,
 				tabbar: tabbar1,
@@ -249,6 +270,35 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			// 打开兑换弹窗
+			openDh() {
+				this.$refs.popupdh.open()
+			},
+			// 关闭兑换弹窗
+			closeDh() {
+				this.dhcode = ''
+				this.$refs.popupdh.close()
+			},
+			// 兑换
+			goDh() {
+				let obj = this
+				if (obj.dhing) {
+					return
+				}
+				if (obj.dhcode == '') {
+					return obj.$api.msg('请输入兑换码')
+				}
+				obj.dhing = true
+				goDh({
+					code: obj.dhcode
+				}).then(res => {
+					obj.dhing = false
+					obj.closeDh()
+					obj.$api.showOk('兑换成功')
+				}).catch(err => {
+					obj.dhing = false
+				})
+			},
 			shareLL() {
 				this.$api.msg('功能建设中，敬请期待');
 			},

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.c81cb096.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.a52d1661.js></script></body></html>

unpackage/dist/build/mp-weixin/pages/order/order.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "我的订单",
   "usingComponents": {
     "uni-load-more": "/components/uni-load-more/uni-load-more",
+    "uni-popup": "/components/uni-popup/uni-popup",
     "empty": "/components/empty"
   }
 }

unpackage/dist/build/mp-weixin/project.config.json

@@ -31,7 +31,8 @@
             "outputPath": ""
         },
         "disableUseStrict": false,
-        "useCompilerPlugins": false
+        "useCompilerPlugins": false,
+        "minifyWXML": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.24.4",