Merge remote-tracking branch 'origin/yijia' into yijia

addons/unishop/uniapp/uni-shop/pages/flash/list.vue

@@ -4,7 +4,7 @@
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{current: tabCurrentIndex === index}"
 			 @click="tabClick(index)">
 				<view class="hour">
-					<view>{{item.starttime_hour}}</view>
+					<view>{{(new Date(item.starttime)).getFullYear()+'-'+((new Date(item.starttime)).getMonth()+1)+'-'+(new Date(item.starttime)).getDay()}}&nbsp{{item.starttime_hour}}</view>
 					<view class="text">{{state[item.state].text}}</view>
 				</view>
 			</view>
@@ -170,7 +170,7 @@
 			// 设置导航栏名称
 			setNavigationBarTitle(title) {
 				uni.setNavigationBarTitle({
-					title: 'Promotion|' + title
+					title: title
 				});
 			}
 
@@ -277,10 +277,13 @@
 				position: relative;
 
 				.title {
+					font-size: $font-lg;
 					color: #303133;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
+					word-break: break-all;
+					line-height: 60upx;
+					// overflow: hidden;
+					// text-overflow: ellipsis;
+					// white-space: nowrap;
 				}
 
 				.introduction {

addons/unishop/uniapp/uni-shop/pages/index/index.vue

@@ -41,14 +41,16 @@
 				 :day="day" :hour="hour" :minute="minute" :second="second" color="#FFFFFF" background-color="#00B26A" border-color="#00B26A"></uni-countdown>
 				<text class="yticon icon-you"></text>
 			</view>
-			<!-- <view class="floor-list-whitelist">
+			<view class="floor-list-whitelist">
 				<view v-for="(item, index) in flashSale.product" :key="index" class="floor-item" @click="navToDetailPage({ product_id: item.flash_product_id }, flashSale.flash_id)">
-					<image :src="item.image" mode="aspectFill"></image>
+					<view style="width:100%;text-align: center;">
+						<image :src="item.image" mode="aspectFill"></image>
+					</view>
 					<text class="title clamp">{{item.title }}</text>
 					<text class="price">￥{{item.sales_price }}</text>
 				</view>
-			</view> -->
-			<scroll-view class="floor-list" scroll-x>
+			</view>
+			<!-- <scroll-view class="floor-list" scroll-x>
 				<view class="scoll-wrapper">
 					<view v-for="(item, index) in flashSale.product" :key="index" class="floor-item" @click="navToDetailPage({ product_id: item.flash_product_id }, flashSale.flash_id)">
 						<image :src="item.image" mode="aspectFill"></image>
@@ -56,7 +58,7 @@
 						<text class="price">￥{{item.sales_price }}</text>
 					</view>
 				</view>
-			</scroll-view>
+			</scroll-view> -->
 		</view>
 
 		<!-- 团购楼层 -->
@@ -257,23 +259,21 @@
 				let login = await this.$api.checkLogin();
 				if (login) {
 					//获取广告图
-					uni.request({
-						url: that.$unishow + '/ads/index',
-						success(res) {
-							let carouselList = res.data.data;
-							that.titleNViewBackground = carouselList[0].background;
-							that.swiperLength = carouselList.length;
-							that.carouselList = carouselList;
-						}
+					that.$api.request('/ads/index', 'GET').then((res) => {
+						console.log(res)
+						let carouselList = res;
+						that.titleNViewBackground = carouselList[0].background;
+						that.swiperLength = carouselList.length;
+						that.carouselList = carouselList;
 					});
 
 					//获取菜单栏
-					uni.request({
-						url: that.$unishow + '/category/menu',
-						success(res) {
-							that.menu = res.data.data;
-						}
-					});
+					// uni.request({
+					// 	url: that.$unishow + '/category/menu',
+					// 	success(res) {
+					// 		that.menu = res.data.data;
+					// 	}
+					// });
 
 					uni.stopPullDownRefresh();
 
@@ -404,7 +404,7 @@
 			position: relative;
 			z-index: 5;
 			border-radius: 16upx 16upx 0 0;
-			margin-top: -20upx;
+			margin-top: 20upx;
 		}
 
 		.carousel-section {
@@ -615,8 +615,9 @@
 		}
 
 		.floor-item {
-			width: 150upx;
-			margin-right: 20upx;
+			width: calc(100%/3);
+			padding-right: 20upx;
+			margin-top: 20upx;
 			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
 			line-height: 1.8;
@@ -796,7 +797,6 @@
 		}
 
 		.floor-item {
-			width: 180upx;
 			margin-right: 20upx;
 			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
@@ -864,7 +864,7 @@
 		}
 
 		.title {
-			font-size: $font-lg;
+			font-size: 12px;
 			color: $font-color-dark;
 			line-height: 80upx;
 		}

addons/unishop/uniapp/uni-shop/pages/order/order.vue

@@ -43,7 +43,7 @@
 							<!-- <text v-if="item.delivery_price > 0">(含运费￥{{item.delivery_price}})</text> -->
 						</view>
 						<view class="action-box b-t" v-if="item.state != 9">
-							<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel Order</button>
+							<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel</button>
 							<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">Pay Immediately</button>
 							<button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">Refund</button>
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->

addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue

@@ -54,7 +54,7 @@
 			<!--兼容苹果系统下margin-bottom不生效-->
 		</view>
 		<view class="bottom" v-if="order.state != 9">
-			<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel Order</button>
+			<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel</button>
 			<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">Pay Immediately</button>
 			<button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">Refund</button>
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html

@@ -1,3 +1,3 @@
 <!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>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.82917b4b.js></script><script src=/h5/static/js/index.3b5ecfdc.js></script></body></html>
+			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.73b1d7ab.js></script><script src=/h5/static/js/index.d1284636.js></script></body></html>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.4356deaf.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-money"],{"90d4":function(n,t,e){"use strict";e.r(t);var u=e("d3d6"),r=e("9a9b");for(var a in r)"default"!==a&&function(n){e.d(t,n,(function(){return r[n]}))}(a);var c,i=e("f0c5"),o=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,"81d3c81e",null,!1,u["a"],c);t["default"]=o.exports},"9a9b":function(n,t,e){"use strict";e.r(t);var u=e("e37b"),r=e.n(u);for(var a in u)"default"!==a&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},d3d6:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("v-uni-view")},a=[]},e37b:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},methods:{}};t.default=u}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.b211c2e6.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-money"],{"12ae":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},methods:{}};t.default=u},aa60:function(n,t,e){"use strict";e.r(t);var u=e("c9bf"),r=e("d90b");for(var a in r)"default"!==a&&function(n){e.d(t,n,(function(){return r[n]}))}(a);var c,f=e("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,"029bd7d7",null,!1,u["a"],c);t["default"]=i.exports},c9bf:function(n,t,e){"use strict";var u,r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("v-uni-view")},a=[];e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}))},d90b:function(n,t,e){"use strict";e.r(t);var u=e("12ae"),r=e.n(u);for(var a in u)"default"!==a&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.10cb1a0e.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-paySuccess"],{"2fb8":function(t,e,n){var i=n("b1a9");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("64742e57",i,!0,{sourceMap:!1,shadowMode:!1})},"4f8c":function(t,e,n){"use strict";var i=n("2fb8"),a=n.n(i);a.a},7288:function(t,e,n){"use strict";n.r(e);var i=n("b52e"),a=n("a6bd");for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("4f8c");var o,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"e4ab3c38",null,!1,i["a"],o);e["default"]=s.exports},a6bd:function(t,e,n){"use strict";n.r(e);var i=n("e52b"),a=n.n(i);for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},b1a9:function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/.content[data-v-e4ab3c38]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.success-icon[data-v-e4ab3c38]{font-size:%?160?%;color:#fa436a;margin-top:%?100?%}.tit[data-v-e4ab3c38]{font-size:%?38?%;color:#303133}.btn-group[data-v-e4ab3c38]{padding-top:%?100?%}.mix-btn[data-v-e4ab3c38]{margin-top:%?30?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:%?600?%;height:%?80?%;font-size:%?32?%;color:#fff;background-color:#fa436a;border-radius:%?10?%}.mix-btn.hollow[data-v-e4ab3c38]{background:#fff;color:#303133;border:1px solid #ccc}',""]),t.exports=e},b52e:function(t,e,n){"use strict";var i,a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("v-uni-text",{staticClass:"success-icon yticon icon-xuanzhong"}),n("v-uni-text",{staticClass:"tit"},[t._v("支付成功")]),n("v-uni-view",{staticClass:"btn-group"},[n("v-uni-navigator",{staticClass:"mix-btn",attrs:{url:"/pages/order/order?state=0","open-type":"redirect"}},[t._v("查看订单")]),n("v-uni-navigator",{staticClass:"mix-btn hollow",attrs:{url:"/pages/index/index","open-type":"switchTab"}},[t._v("返回首页")])],1)],1)},c=[];n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}))},e52b:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={data:function(){return{}},methods:{}};e.default=i}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.4ddaf3f4.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-paySuccess"],{"2f34":function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("v-uni-text",{staticClass:"success-icon yticon icon-xuanzhong"}),n("v-uni-text",{staticClass:"tit"},[t._v("支付成功")]),n("v-uni-view",{staticClass:"btn-group"},[n("v-uni-navigator",{staticClass:"mix-btn",attrs:{url:"/pages/order/order?state=0","open-type":"redirect"}},[t._v("查看订单")]),n("v-uni-navigator",{staticClass:"mix-btn hollow",attrs:{url:"/pages/index/index","open-type":"switchTab"}},[t._v("返回首页")])],1)],1)},c=[]},"64d7":function(t,e,n){"use strict";n.r(e);var i=n("2f34"),a=n("aa8e");for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("e58b");var o,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"7d8e42c9",null,!1,i["a"],o);e["default"]=s.exports},9194:function(t,e,n){var i=n("b5ef");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("8c721866",i,!0,{sourceMap:!1,shadowMode:!1})},aa8e:function(t,e,n){"use strict";n.r(e);var i=n("d173"),a=n.n(i);for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},b5ef:function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/.content[data-v-7d8e42c9]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.success-icon[data-v-7d8e42c9]{font-size:%?160?%;color:#fa436a;margin-top:%?100?%}.tit[data-v-7d8e42c9]{font-size:%?38?%;color:#303133}.btn-group[data-v-7d8e42c9]{padding-top:%?100?%}.mix-btn[data-v-7d8e42c9]{margin-top:%?30?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:%?600?%;height:%?80?%;font-size:%?32?%;color:#fff;background-color:#fa436a;border-radius:%?10?%}.mix-btn.hollow[data-v-7d8e42c9]{background:#fff;color:#303133;border:1px solid #ccc}',""]),t.exports=e},d173:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={data:function(){return{}},methods:{}};e.default=i},e58b:function(t,e,n){"use strict";var i=n("9194"),a=n.n(i);a.a}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.8b8c1829.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-evaluate"],{2307:function(t,e,a){var i=a("e480");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=a("4f06").default;n("021391f1",i,!0,{sourceMap:!1,shadowMode:!1})},6274:function(t,e,a){"use strict";a.r(e);var i=a("ad5b"),n=a.n(i);for(var r in i)"default"!==r&&function(t){a.d(e,t,(function(){return i[t]}))}(r);e["default"]=n.a},ad5b:function(t,e,a){"use strict";var i=a("ee27");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,a("96cf");var n=i(a("c964")),r=i(a("57df")),o={computed:{},components:{uniRate:r.default},data:function(){return{order_id:0,product_id:0,title:"",image:"",spec:"",rate:5,radio:!0,textarea:""}},onLoad:function(t){this.title=t.title,this.image=t.image,this.spec=t.spec,this.order_id=t.order_id,this.product_id=t.product_id},methods:{start:function(t){switch(this.rate=t.value,this.rate){case 3:this.radio=!1;break;case 5:this.radio=!0;break}},clickRadio:function(t){this.radio=!this.radio},input:function(t){this.textarea=t.detail.value},submit:function(){var t=this;return(0,n.default)(regeneratorRuntime.mark((function e(){var a,i;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:a=t.$api.request("/order/comment","POST",{order_id:t.order_id,product_id:t.product_id,rate:t.rate,anonymous:t.radio?0:1,comment:t.textarea}),a&&(i=t.$api.prePage(),i.tabCurrentIndex&&(i.tabCurrentIndex=0),t,setTimeout((function(){i.pullDownRefresh(),uni.navigateBack()}),2e3));case 2:case"end":return e.stop()}}),e)})))()}}};e.default=o},b1d9:function(t,e,a){"use strict";var i=a("2307"),n=a.n(i);n.a},d37e:function(t,e,a){"use strict";var i={uniRate:a("57df").default},n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"bg"},[a("v-uni-view",{staticClass:"header"},[a("v-uni-image",{staticClass:"image",attrs:{src:t.image}}),a("v-uni-view",{staticClass:"right"},[a("v-uni-view",{staticClass:"title"},[t._v(t._s(t.title))]),a("v-uni-view",{staticClass:"spec"},[t._v(t._s(t.spec))])],1)],1),a("v-uni-view",{staticClass:"rate"},[a("v-uni-view",{staticClass:"dec"},[t._v("描述相符")]),a("uni-rate",{staticClass:"start",attrs:{"active-color":"#e64340",margin:"10",size:"30",value:t.rate},on:{change:function(e){arguments[0]=e=t.$handleEvent(e),t.start.apply(void 0,arguments)}}})],1),a("v-uni-view",{staticClass:"comment"},[a("v-uni-textarea",{attrs:{maxlength:"300",placeholder:"写满20字,有机会被选为优质评价被更多人看到哦~","placeholder-class":"placeholder"},on:{input:function(e){arguments[0]=e=t.$handleEvent(e),t.input.apply(void 0,arguments)}}})],1),a("v-uni-view",{staticClass:"bottom"},[a("v-uni-radio",{staticClass:"radio",attrs:{color:"#e64340",checked:t.radio},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.clickRadio.apply(void 0,arguments)}}}),t._v("公开"),a("v-uni-view",{staticClass:"dec"},[t._v("公开头像昵称,大家可以看到我")])],1),a("v-uni-button",{staticClass:"button",attrs:{type:"warn"},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.submit.apply(void 0,arguments)}}},[t._v("Submit")])],1)},r=[];a.d(e,"b",(function(){return n})),a.d(e,"c",(function(){return r})),a.d(e,"a",(function(){return i}))},e480:function(t,e,a){var i=a("24fb");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-30a8e1e2]{background:#f5f5f5}.bg[data-v-30a8e1e2]{margin:%?20?%;border-radius:%?20?%;background-color:#fff;padding-bottom:%?10?%}.header[data-v-30a8e1e2]{padding:%?20?%}.header .image[data-v-30a8e1e2]{width:%?120?%;height:%?120?%}.header .right[data-v-30a8e1e2]{display:inline-block;line-height:%?45?%;vertical-align:text-bottom;padding-bottom:%?10?%;width:%?550?%;padding-left:%?20?%}.header .right .title[data-v-30a8e1e2]{color:#707277;font-size:%?33?%;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.header .right .spec[data-v-30a8e1e2]{color:#91949a;font-size:%?30?%}.rate[data-v-30a8e1e2]{padding:0 %?20?% %?20?%}.rate .dec[data-v-30a8e1e2]{display:inline-block;color:#707277}.rate .start[data-v-30a8e1e2]{width:%?400?%;display:inline-block}.comment[data-v-30a8e1e2]{padding:%?20?%}.comment uni-textarea[data-v-30a8e1e2]{padding:%?30?%;background-color:#f5f5f5;width:100%}.bottom[data-v-30a8e1e2]{padding:%?20?% %?20?% %?40?%}.bottom .radio[data-v-30a8e1e2]{vertical-align:bottom;float:left}.bottom .dec[data-v-30a8e1e2]{color:#91949a;float:right}.button[data-v-30a8e1e2]{margin:%?20?%}body.?%PAGE?%[data-v-30a8e1e2]{background:#f5f5f5}',""]),t.exports=e},fa59:function(t,e,a){"use strict";a.r(e);var i=a("d37e"),n=a("6274");for(var r in n)"default"!==r&&function(t){a.d(e,t,(function(){return n[t]}))}(r);a("b1d9");var o,d=a("f0c5"),s=Object(d["a"])(n["default"],i["b"],i["c"],!1,null,"30a8e1e2",null,!1,i["a"],o);e["default"]=s.exports}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.d4c44ee8.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-evaluate"],{"3fea":function(t,a,e){var i=e("cefa");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=e("4f06").default;n("04f94a7e",i,!0,{sourceMap:!1,shadowMode:!1})},7220:function(t,a,e){"use strict";e.r(a);var i=e("b747"),n=e.n(i);for(var r in i)"default"!==r&&function(t){e.d(a,t,(function(){return i[t]}))}(r);a["default"]=n.a},"8bba":function(t,a,e){"use strict";e.d(a,"b",(function(){return n})),e.d(a,"c",(function(){return r})),e.d(a,"a",(function(){return i}));var i={uniRate:e("5f82").default},n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("v-uni-view",{staticClass:"bg"},[e("v-uni-view",{staticClass:"header"},[e("v-uni-image",{staticClass:"image",attrs:{src:t.image}}),e("v-uni-view",{staticClass:"right"},[e("v-uni-view",{staticClass:"title"},[t._v(t._s(t.title))]),e("v-uni-view",{staticClass:"spec"},[t._v(t._s(t.spec))])],1)],1),e("v-uni-view",{staticClass:"rate"},[e("v-uni-view",{staticClass:"dec"},[t._v("描述相符")]),e("uni-rate",{staticClass:"start",attrs:{"active-color":"#e64340",margin:"10",size:"30",value:t.rate},on:{change:function(a){arguments[0]=a=t.$handleEvent(a),t.start.apply(void 0,arguments)}}})],1),e("v-uni-view",{staticClass:"comment"},[e("v-uni-textarea",{attrs:{maxlength:"300",placeholder:"写满20字,有机会被选为优质评价被更多人看到哦~","placeholder-class":"placeholder"},on:{input:function(a){arguments[0]=a=t.$handleEvent(a),t.input.apply(void 0,arguments)}}})],1),e("v-uni-view",{staticClass:"bottom"},[e("v-uni-radio",{staticClass:"radio",attrs:{color:"#e64340",checked:t.radio},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.clickRadio.apply(void 0,arguments)}}}),t._v("公开"),e("v-uni-view",{staticClass:"dec"},[t._v("公开头像昵称,大家可以看到我")])],1),e("v-uni-button",{staticClass:"button",attrs:{type:"warn"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.submit.apply(void 0,arguments)}}},[t._v("Submit")])],1)},r=[]},b0c9:function(t,a,e){"use strict";var i=e("3fea"),n=e.n(i);n.a},b747:function(t,a,e){"use strict";var i=e("4ea4");Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0,e("96cf");var n=i(e("1da1")),r=i(e("5f82")),o={computed:{},components:{uniRate:r.default},data:function(){return{order_id:0,product_id:0,title:"",image:"",spec:"",rate:5,radio:!0,textarea:""}},onLoad:function(t){this.title=t.title,this.image=t.image,this.spec=t.spec,this.order_id=t.order_id,this.product_id=t.product_id},methods:{start:function(t){switch(this.rate=t.value,this.rate){case 3:this.radio=!1;break;case 5:this.radio=!0;break}},clickRadio:function(t){this.radio=!this.radio},input:function(t){this.textarea=t.detail.value},submit:function(){var t=this;return(0,n.default)(regeneratorRuntime.mark((function a(){var e,i;return regeneratorRuntime.wrap((function(a){while(1)switch(a.prev=a.next){case 0:e=t.$api.request("/order/comment","POST",{order_id:t.order_id,product_id:t.product_id,rate:t.rate,anonymous:t.radio?0:1,comment:t.textarea}),e&&(i=t.$api.prePage(),i.tabCurrentIndex&&(i.tabCurrentIndex=0),t,setTimeout((function(){i.pullDownRefresh(),uni.navigateBack()}),2e3));case 2:case"end":return a.stop()}}),a)})))()}}};a.default=o},c5e8:function(t,a,e){"use strict";e.r(a);var i=e("8bba"),n=e("7220");for(var r in n)"default"!==r&&function(t){e.d(a,t,(function(){return n[t]}))}(r);e("b0c9");var o,d=e("f0c5"),c=Object(d["a"])(n["default"],i["b"],i["c"],!1,null,"30a8e1e2",null,!1,i["a"],o);a["default"]=c.exports},cefa:function(t,a,e){var i=e("24fb");a=i(!1),a.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-30a8e1e2]{background:#f5f5f5}.bg[data-v-30a8e1e2]{margin:%?20?%;border-radius:%?20?%;background-color:#fff;padding-bottom:%?10?%}.header[data-v-30a8e1e2]{padding:%?20?%}.header .image[data-v-30a8e1e2]{width:%?120?%;height:%?120?%}.header .right[data-v-30a8e1e2]{display:inline-block;line-height:%?45?%;vertical-align:text-bottom;padding-bottom:%?10?%;width:%?550?%;padding-left:%?20?%}.header .right .title[data-v-30a8e1e2]{color:#707277;font-size:%?33?%;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.header .right .spec[data-v-30a8e1e2]{color:#91949a;font-size:%?30?%}.rate[data-v-30a8e1e2]{padding:0 %?20?% %?20?%}.rate .dec[data-v-30a8e1e2]{display:inline-block;color:#707277}.rate .start[data-v-30a8e1e2]{width:%?400?%;display:inline-block}.comment[data-v-30a8e1e2]{padding:%?20?%}.comment uni-textarea[data-v-30a8e1e2]{padding:%?30?%;background-color:#f5f5f5;width:100%}.bottom[data-v-30a8e1e2]{padding:%?20?% %?20?% %?40?%}.bottom .radio[data-v-30a8e1e2]{vertical-align:bottom;float:left}.bottom .dec[data-v-30a8e1e2]{color:#91949a;float:right}.button[data-v-30a8e1e2]{margin:%?20?%}body.?%PAGE?%[data-v-30a8e1e2]{background:#f5f5f5}',""]),t.exports=a}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.d120a4b8.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-public-webview"],{1058:function(t,n,e){"use strict";var u,r=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-web-view",{attrs:{src:t.url}})],1)},i=[];e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return u}))},"35f9":function(t,n,e){"use strict";e.r(n);var u=e("1058"),r=e("7bd1");for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);var a,c=e("f0c5"),f=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"0d7161b6",null,!1,u["a"],a);n["default"]=f.exports},"7bd1":function(t,n,e){"use strict";e.r(n);var u=e("87fd"),r=e.n(u);for(var i in u)"default"!==i&&function(t){e.d(n,t,(function(){return u[t]}))}(i);n["default"]=r.a},"87fd":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{url:""}},created:function(){},onLoad:function(t){switch(t.type){case"kd":this.url="https://m.kuaidi100.com/result.jsp?nu="+t.number;break;case"MWEB":uni.setNavigationBarTitle({title:"微信支付"});break}}};n.default=u}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.fe781d24.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-public-webview"],{"132a":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={data:function(){return{url:""}},created:function(){},onLoad:function(t){switch(t.type){case"kd":this.url="https://m.kuaidi100.com/result.jsp?nu="+t.number;break;case"MWEB":uni.setNavigationBarTitle({title:"微信支付"});break}}};n.default=u},6229:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return u}));var r=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",[e("v-uni-web-view",{attrs:{src:t.url}})],1)},a=[]},"6a98":function(t,n,e){"use strict";e.r(n);var u=e("6229"),r=e("95b3");for(var a in r)"default"!==a&&function(t){e.d(n,t,(function(){return r[t]}))}(a);var i,c=e("f0c5"),o=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"fc7509c6",null,!1,u["a"],i);n["default"]=o.exports},"95b3":function(t,n,e){"use strict";e.r(n);var u=e("132a"),r=e.n(u);for(var a in u)"default"!==a&&function(t){e.d(n,t,(function(){return u[t]}))}(a);n["default"]=r.a}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.76d5a0b0.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{"11ff":function(t,e,a){var n=a("df5e");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=a("4f06").default;i("5d4a3950",n,!0,{sourceMap:!1,shadowMode:!1})},"12bc":function(t,e,a){"use strict";a.r(e);var n=a("4602"),i=a("c824");for(var l in i)"default"!==l&&function(t){a.d(e,t,(function(){return i[t]}))}(l);a("a6ba");var c,o=a("f0c5"),s=Object(o["a"])(i["default"],n["b"],n["c"],!1,null,"3e7a92cb",null,!1,n["a"],c);e["default"]=s.exports},4602:function(t,e,a){"use strict";var n,i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"container"},[a("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.navTo("/pages/userinfo/userinfo")}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),a("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),a("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toLogout.apply(void 0,arguments)}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[];a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return l})),a.d(e,"a",(function(){return n}))},"4d8f":function(t,e,a){"use strict";var n=a("ee27");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n(a("f3f3")),l=a("2f62"),c={data:function(){return{}},methods:(0,i.default)({},(0,l.mapMutations)(["logout"]),{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({cancelText:"Cancel",confirmText:"OK",content:"Are you sure you want to log out",success:function(e){e.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var e=t.detail.value?"打开":"关闭";this.$api.msg("".concat(e,"消息推送"))}})};e.default=c},a6ba:function(t,e,a){"use strict";var n=a("11ff"),i=a.n(n);i.a},c824:function(t,e,a){"use strict";a.r(e);var n=a("4d8f"),i=a.n(n);for(var l in n)"default"!==l&&function(t){a.d(e,t,(function(){return n[t]}))}(l);e["default"]=i.a},df5e:function(t,e,a){var n=a("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-3e7a92cb]{background:#f8f8f8}.list-cell[data-v-3e7a92cb]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-3e7a92cb]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-3e7a92cb]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-3e7a92cb]{background:#fafafa}.list-cell.b-b[data-v-3e7a92cb]:after{left:%?30?%}.list-cell.m-t[data-v-3e7a92cb]{margin-top:%?16?%}.list-cell .cell-more[data-v-3e7a92cb]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-3e7a92cb]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-3e7a92cb]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-3e7a92cb]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-3e7a92cb]{background:#f8f8f8}',""]),t.exports=e}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.aecabb0c.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{7111:function(t,e,a){"use strict";a.r(e);var n=a("f47c"),i=a("d237");for(var l in i)"default"!==l&&function(t){a.d(e,t,(function(){return i[t]}))}(l);a("9b46");var c,o=a("f0c5"),s=Object(o["a"])(i["default"],n["b"],n["c"],!1,null,"3e7a92cb",null,!1,n["a"],c);e["default"]=s.exports},"9b46":function(t,e,a){"use strict";var n=a("db20"),i=a.n(n);i.a},d237:function(t,e,a){"use strict";a.r(e);var n=a("f733"),i=a.n(n);for(var l in n)"default"!==l&&function(t){a.d(e,t,(function(){return n[t]}))}(l);e["default"]=i.a},db20:function(t,e,a){var n=a("e2d8");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=a("4f06").default;i("84713e62",n,!0,{sourceMap:!1,shadowMode:!1})},e2d8:function(t,e,a){var n=a("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-3e7a92cb]{background:#f8f8f8}.list-cell[data-v-3e7a92cb]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-3e7a92cb]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-3e7a92cb]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-3e7a92cb]{background:#fafafa}.list-cell.b-b[data-v-3e7a92cb]:after{left:%?30?%}.list-cell.m-t[data-v-3e7a92cb]{margin-top:%?16?%}.list-cell .cell-more[data-v-3e7a92cb]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-3e7a92cb]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-3e7a92cb]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-3e7a92cb]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-3e7a92cb]{background:#f8f8f8}',""]),t.exports=e},f47c:function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return l})),a.d(e,"a",(function(){return n}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"container"},[a("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.navTo("/pages/userinfo/userinfo")}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),a("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),a("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toLogout.apply(void 0,arguments)}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[]},f733:function(t,e,a){"use strict";var n=a("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n(a("5530")),l=a("2f62"),c={data:function(){return{}},methods:(0,i.default)((0,i.default)({},(0,l.mapMutations)(["logout"])),{},{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({cancelText:"Cancel",confirmText:"OK",content:"Are you sure you want to log out",success:function(e){e.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var e=t.detail.value?"打开":"关闭";this.$api.msg("".concat(e,"消息推送"))}})};e.default=c}}]);