2 years ago · 9ece6cd125
--- a/pages/shop/shopDetail.vue
+++ b/pages/shop/shopDetail.vue
@@ -182,6 +182,7 @@
 
				 			},

			
 
				 			getaddress() {

			
 
				 				console.log('dizhi+++++++++++');

			
 
				+				

			
 
				 				let obj = this;

			
 
				 				// #ifdef H5

			
 
				 				weixindata().then(wxOjb => {

			
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -52,6 +52,8 @@
 
				 			</uni-list-item>

			
 
				 			<uni-list-item v-if="userInfo.clerk_type == 1" title="核销历史" @click="navTo('/pages/user/hxjl')"

			
 
				 				thumb="/static/user/user2.png"></uni-list-item>

			
 
				+			<uni-list-item v-if="userInfo.clerk_type == 1" title="添加优惠券" @click="navTo('/pages/shop/createYhq')"

			
 
				+				thumb="/static/icon/addyhq.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">

			
--- a/static/icon/addyhq.png
+++ b/static/icon/addyhq.png
--- a/unpackage/dist/build/h5/6-20-2.rar
+++ b/unpackage/dist/build/h5/6-20-2.rar
--- a/unpackage/dist/build/h5/index.html
+++ b/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.a52d1661.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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3a9bf0f3.js></script><script src=/index/static/js/index.c0d93ae7.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/icon/addyhq.png
+++ b/unpackage/dist/build/h5/static/icon/addyhq.png
--- a/unpackage/dist/build/h5/static/index.2772579d.css
+++ b/unpackage/dist/build/h5/static/index.2772579d.css
--- a/unpackage/dist/build/h5/static/index.a5c69d49.css
+++ b/unpackage/dist/build/h5/static/index.a5c69d49.css
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.3a9bf0f3.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.3a9bf0f3.js
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.58012eb0.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.58012eb0.js
--- a/unpackage/dist/build/h5/static/js/index.a52d1661.js
+++ b/unpackage/dist/build/h5/static/js/index.a52d1661.js
--- a/unpackage/dist/build/h5/static/js/index.c0d93ae7.js
+++ b/unpackage/dist/build/h5/static/js/index.c0d93ae7.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.8212055b.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.8212055b.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.1ce31815.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.1ce31815.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.4928ef94.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.4928ef94.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order~pages-user-user.786b5544.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order~pages-user-user.786b5544.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order~pages-user-user.ebc505d8.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order~pages-user-user.ebc505d8.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-createYhq.c8dc994b.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-createYhq.c8dc994b.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-djqQm.cfa86d17.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-djqQm.cfa86d17.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-shareF.77898047.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-shareF.77898047.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-shopDetail.127d08b1.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-shopDetail.127d08b1.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-shopDetail.6c037aab.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-shopDetail.6c037aab.js
--- a/unpackage/dist/build/h5/static/js/pages-shop-shopList.2358ff0b.js
+++ b/unpackage/dist/build/h5/static/js/pages-shop-shopList.2358ff0b.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.2e073871.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.2e073871.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.cc1b011e.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.cc1b011e.js
--- a/unpackage/dist/build/mp-weixin/app.json
+++ b/unpackage/dist/build/mp-weixin/app.json
@@ -9,6 +9,7 @@
 
				         "pages/shop/yhqDetail",
			
 
				         "pages/shop/shopDetail",
			
 
				         "pages/shop/giftDetail",
			
 
				+        "pages/shop/createYhq",
			
 
				         "pages/public/register",
			
 
				         "pages/user/jiedianDetails",
			
 
				         "pages/user/hxjl",
			
--- a/unpackage/dist/build/mp-weixin/common/vendor.js
+++ b/unpackage/dist/build/mp-weixin/common/vendor.js
--- a/unpackage/dist/build/mp-weixin/pages/shop/createYhq.js
+++ b/unpackage/dist/build/mp-weixin/pages/shop/createYhq.js
--- a/unpackage/dist/build/mp-weixin/pages/shop/createYhq.json
+++ b/unpackage/dist/build/mp-weixin/pages/shop/createYhq.json
@@ -0,0 +1,4 @@
 
				+{
			
 
				+  "navigationBarTitleText": "添加优惠券",
			
 
				+  "usingComponents": {}
			
 
				+}
			
--- a/unpackage/dist/build/mp-weixin/pages/shop/createYhq.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/shop/createYhq.wxml
--- a/unpackage/dist/build/mp-weixin/pages/shop/createYhq.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/shop/createYhq.wxss
@@ -0,0 +1 @@
 
				+.jg{height:20rpx}.tab{width:690rpx;margin:auto;border-radius:10px;background-color:#fff;margin-bottom:20rpx}.tab .tab-item{padding:0 20rpx;font-size:30rpx;align-items:flex-start;line-height:100rpx;border-bottom:1px #f0f0f0 solid}.tab .tab-item:last-of-type{border-bottom:none}.tab .tab-item .item-name{flex-shrink:0;width:220rpx;color:#333}.tab .tab-item .item-area{border:1px #f0f0f0 solid;margin:28rpx 0;border-radius:20rpx}.tab .tab-item .item-val{display:inline-block;flex-grow:1;text-align:left;line-height:100rpx;height:100rpx}.sub{text-align:center;width:560rpx;line-height:80rpx;background:#ff005d;border-radius:40rpx;color:#fff;font-size:30rpx;font-weight:500;margin:80rpx auto 0}.empty{color:#999}
			
--- a/unpackage/dist/build/mp-weixin/pages/shop/shopDetail.js
+++ b/unpackage/dist/build/mp-weixin/pages/shop/shopDetail.js
--- a/unpackage/dist/build/mp-weixin/pages/user/user.js
+++ b/unpackage/dist/build/mp-weixin/pages/user/user.js
--- a/unpackage/dist/build/mp-weixin/pages/user/user.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/user/user.wxml
--- a/unpackage/dist/build/mp-weixin/static/icon/addyhq.png
+++ b/unpackage/dist/build/mp-weixin/static/icon/addyhq.png