移除运费

4 years ago · 2fe989bbb2
--- a/addons/unishop/behavior/Order.php
+++ b/addons/unishop/behavior/Order.php
@@ -172,20 +172,21 @@ class Order
            $orderPrice = bcadd($orderPrice, bcmul($productInfo['sales_price'], $numbers[$key], 2), 2);
            $baseProductInfo[] = $productInfo;
        }

        $delivery=0;
        // 条件三
        $delivery = (new DeliveryRuleModel())->cityInScopeOfDelivery($extra['city_id'], $extra['delivery_id']);
        if (!$delivery) {
            throw new Exception(__('Your receiving address is not within the scope of delivery'));
        } else {
            if ($delivery['min'] > array_sum($numbers)) {
                throw new Exception(__('You must purchase at least %s item to use this shipping method', $delivery['min']));
            }
        }
        $address = (new Address)->where(['id' => $extra['address_id'], 'user_id' => $extra['userId']])->find();
        if (!$address) {
            throw new Exception(__('Address not exist'));
        }
 //        $delivery = (new DeliveryRuleModel())->cityInScopeOfDelivery($extra['city_id'], $extra['delivery_id']);
 //        if (!$delivery) {
 //            throw new Exception(__('Your receiving address is not within the scope of delivery'));
 //        } else {
 //            if ($delivery['min'] > array_sum($numbers)) {
 //                throw new Exception(__('You must purchase at least %s item to use this shipping method', $delivery['min']));
 //            }
 //        }
 $address=[];
 //        $address = (new Address)->where(['id' => $extra['address_id'], 'user_id' => $extra['userId']])->find();
 //        if (!$address) {
 //            throw new Exception(__('Address not exist'));
 //        }

        // 条件四
        if ($extra['coupon_id']) {
--- a/addons/unishop/model/Order.php
+++ b/addons/unishop/model/Order.php
@@ -261,10 +261,10 @@ class Order extends Model
            'order_id' => $id,
            'coupon_id' => $coupon ? $coupon['id'] : 0,
            'coupon_json' => json_encode($coupon),
            'delivery_id' => $delivery['id'],
            'delivery_json' => json_encode($delivery),
            'address_id' => $address['id'],
            'address_json' => json_encode($address),
 //            'delivery_id' => $delivery['id'],
 //            'delivery_json' => json_encode($delivery),
 //            'address_id' => $address['id'],
 //            'address_json' => json_encode($address),
        ]);


--- a/addons/unishop/uniapp/uni-shop/main.js
+++ b/addons/unishop/uniapp/uni-shop/main.js
@@ -3,7 +3,8 @@ import store from './store'
 import App from './App'

 // 后端api地址
 Vue.prototype.$unishow = "http://47.101.187.29:8082/addons/unishop";
 // Vue.prototype.$unishow = "http://47.101.187.29:8082/addons/unishop";
 Vue.prototype.$unishow = "http://shop1.com/index.php/addons/unishop";
 //Vue.prototype.$unishow = "http://t.fastadmin-ceshi.com:8888/addons/unishop";
 //Vue.prototype.$unishow = "http://shop.weivee.com/addons/unishop";

@@ -12,7 +13,7 @@ uni.getSystemInfo({
 	success(res) {
 		//console.log(res)
 		if (res.platform != "devtools") {
 			Vue.prototype.$unishow = "http://47.101.187.29:8082/addons/unishop";
 			Vue.prototype.$unishow = "http://shop1.com/index.php/addons/unishop";
 		}
 	}
 })
--- a/addons/unishop/uniapp/uni-shop/pages.json
+++ b/addons/unishop/uniapp/uni-shop/pages.json
@@ -6,12 +6,12 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				// #ifdef MP 
 				"navigationBarTitleText": "喂喂商城",
 				"navigationBarTitleText": "IKEA商城",
 				//"navigationStyle": "custom",
 				// #endif 
 				"app-plus": {
 					"titleNView": {
 						"titleText": "喂喂商城"
 						"titleText": "IKEA商城"
 						//"type": "transparent"
 						// "searchInput": {
 						// 	"backgroundColor": "rgba(231, 231, 231,.7)",
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/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.08825c65.js></script><script src=/h5/static/js/index.a3ed1810.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.82917b4b.js></script><script src=/h5/static/js/index.d36e0a76.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/index.css
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/index.css
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.08825c65.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.08825c65.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.a3ed1810.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.a3ed1810.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.9b4f1d57.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.9b4f1d57.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.e2bad015.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-addressManage.e2bad015.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-cart-cart.7a903df6.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-cart-cart.7a903df6.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-category-category.c7e329b2.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-category-category.c7e329b2.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite.4dc41028.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite.4dc41028.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite~pages-flash-list~pages-order-order.14bc2ead.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-favorite-favorite~pages-flash-list~pages-order-order.14bc2ead.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.b05f1c41.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-flash-list.b05f1c41.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.4f86bcfb.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-index-index.4f86bcfb.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.36e1bdba.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-money.36e1bdba.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-money"],{"1b1f":function(n,t,e){"use strict";e.r(t);var u=e("b3c1"),r=e.n(u);for(var c in u)"default"!==c&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=r.a},5285:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return c})),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")},c=[]},b216:function(n,t,e){"use strict";e.r(t);var u=e("5285"),r=e("1b1f");for(var c in r)"default"!==c&&function(n){e.d(t,n,(function(){return r[n]}))}(c);var a,f=e("f0c5"),i=Object(f["a"])(r["default"],u["b"],u["c"],!1,null,"81d3c81e",null,!1,u["a"],a);t["default"]=i.exports},b3c1: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}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.1d1e5f8e.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.1d1e5f8e.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.7cfdff4f.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.7cfdff4f.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-paySuccess"],{"01f0":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},"0cc5":function(t,e,n){"use strict";n.r(e);var i=n("01f0"),c=n.n(i);for(var a in i)"default"!==a&&function(t){n.d(e,t,(function(){return i[t]}))}(a);e["default"]=c.a},"26d2":function(t,e,n){"use strict";var i=n("cd1e"),c=n.n(i);c.a},"5f22":function(t,e,n){"use strict";n.r(e);var i=n("b763"),c=n("0cc5");for(var a in c)"default"!==a&&function(t){n.d(e,t,(function(){return c[t]}))}(a);n("26d2");var o,r=n("f0c5"),s=Object(r["a"])(c["default"],i["b"],i["c"],!1,null,"7d8e42c9",null,!1,i["a"],o);e["default"]=s.exports},"620b":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},b763:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return c})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return i}));var c=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)},a=[]},cd1e:function(t,e,n){var i=n("620b");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var c=n("4f06").default;c("4e22cf5e",i,!0,{sourceMap:!1,shadowMode:!1})}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-notice-notice.669ee3c9.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-notice-notice.669ee3c9.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.cd3f1d12.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.cd3f1d12.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-delivery.bb52e16f.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-delivery.bb52e16f.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.ca7fe4a2.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.ca7fe4a2.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-evaluate"],{"02be":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("d513").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("提交")])],1)},r=[]},"15a0":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-d51ec804]{background:#f5f5f5}.bg[data-v-d51ec804]{margin:%?20?%;border-radius:%?20?%;background-color:#fff;padding-bottom:%?10?%}.header[data-v-d51ec804]{padding:%?20?%}.header .image[data-v-d51ec804]{width:%?120?%;height:%?120?%}.header .right[data-v-d51ec804]{display:inline-block;line-height:%?45?%;vertical-align:text-bottom;padding-bottom:%?10?%;width:%?550?%;padding-left:%?20?%}.header .right .title[data-v-d51ec804]{color:#707277;font-size:%?33?%;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.header .right .spec[data-v-d51ec804]{color:#91949a;font-size:%?30?%}.rate[data-v-d51ec804]{padding:0 %?20?% %?20?%}.rate .dec[data-v-d51ec804]{display:inline-block;color:#707277}.rate .start[data-v-d51ec804]{width:%?400?%;display:inline-block}.comment[data-v-d51ec804]{padding:%?20?%}.comment uni-textarea[data-v-d51ec804]{padding:%?30?%;background-color:#f5f5f5;width:100%}.bottom[data-v-d51ec804]{padding:%?20?% %?20?% %?40?%}.bottom .radio[data-v-d51ec804]{vertical-align:bottom;float:left}.bottom .dec[data-v-d51ec804]{color:#91949a;float:right}.button[data-v-d51ec804]{margin:%?20?%}body.?%PAGE?%[data-v-d51ec804]{background:#f5f5f5}',""]),t.exports=a},"306a":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("d513")),d={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=d},4756:function(t,a,e){"use strict";e.r(a);var i=e("02be"),n=e("59e4");for(var r in n)"default"!==r&&function(t){e.d(a,t,(function(){return n[t]}))}(r);e("f385");var d,o=e("f0c5"),c=Object(o["a"])(n["default"],i["b"],i["c"],!1,null,"d51ec804",null,!1,i["a"],d);a["default"]=c.exports},"59e4":function(t,a,e){"use strict";e.r(a);var i=e("306a"),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},e220:function(t,a,e){var i=e("15a0");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=e("4f06").default;n("0073afc0",i,!0,{sourceMap:!1,shadowMode:!1})},f385:function(t,a,e){"use strict";var i=e("e220"),n=e.n(i);n.a}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate~pages-order-refund.470b5a5a.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate~pages-order-refund.470b5a5a.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.c31a4022.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.c31a4022.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.8a2f002f.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-orderDetail.8a2f002f.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-refund.cd84d4d2.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-refund.cd84d4d2.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-evaluate.890c8d0b.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-evaluate.890c8d0b.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-product-evaluate"],{1435:function(t,e,i){"use strict";var a;i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return o})),i.d(e,"a",(function(){return a}));var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("v-uni-view",[i("v-uni-view",{staticClass:"eva-section"},t._l(t.list,(function(e,a){return i("v-uni-view",{key:a,staticClass:"eva-box"},[i("v-uni-image",{staticClass:"portrait",attrs:{src:e.avatar,mode:"aspectFill"}}),i("v-uni-view",{staticClass:"right"},[i("v-uni-text",{staticClass:"name"},[t._v(t._s(e.username||"游客"))]),i("v-uni-text",{staticClass:"con"},[t._v(t._s(e.comment))]),i("v-uni-view",{staticClass:"bot"},[""!=e.spec?i("v-uni-text",{staticClass:"attr"},[t._v("购买类型："+t._s(e.spec))]):i("v-uni-text",{staticClass:"attr"}),i("v-uni-text",{staticClass:"time"},[t._v(t._s(e.createtime_text))])],1)],1)],1)})),1)],1)},o=[]},"92d9":function(t,e,i){"use strict";i.r(e);var a=i("c1d0"),n=i.n(a);for(var o in a)"default"!==o&&function(t){i.d(e,t,(function(){return a[t]}))}(o);e["default"]=n.a},a656:function(t,e,i){"use strict";var a=i("f289"),n=i.n(a);n.a},c1d0:function(t,e,i){"use strict";var a=i("4ea4");i("4160"),i("159b"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,i("96cf");var n=a(i("1da1")),o={data:function(){return{product_id:0,page:1,pageSize:20,list:[]}},onLoad:function(t){this.product_id=t.product_id,this.getEvaluete()},onPullDownRefresh:function(){this.page=1,this.list=[],this.getEvaluete()},onReachBottom:function(){this.getEvaluete()},methods:{getEvaluete:function(){var t=this;return(0,n.default)(regeneratorRuntime.mark((function e(){var i;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,t.$api.request("/product/evaluate","GET",{product_id:t.product_id,page:t.page,pagesize:t.pageSize});case 2:i=e.sent,uni.stopPullDownRefresh(),i&&(t.page++,i.forEach((function(e){t.list.push(e)})));case 5:case"end":return e.stop()}}),e)})))()}}};e.default=o},c2cc:function(t,e,i){var a=i("24fb");e=a(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/\n/* 评价 */.eva-section[data-v-e97c33f0]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;padding:%?20?% %?30?%;background:#fff;margin-top:%?16?%}.eva-box[data-v-e97c33f0]{display:-webkit-box;display:-webkit-flex;display:flex;padding:%?20?% 0}.eva-box .portrait[data-v-e97c33f0]{-webkit-flex-shrink:0;flex-shrink:0;width:%?80?%;height:%?80?%;border-radius:100px}.eva-box .right[data-v-e97c33f0]{-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;font-size:%?28?%;color:#606266;padding-left:%?26?%}.eva-box .right .con[data-v-e97c33f0]{font-size:%?28?%;color:#303133;padding:%?20?% 0}.eva-box .right .bot[data-v-e97c33f0]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;font-size:%?24?%;color:#909399}',""]),t.exports=e},db07:function(t,e,i){"use strict";i.r(e);var a=i("1435"),n=i("92d9");for(var o in n)"default"!==o&&function(t){i.d(e,t,(function(){return n[t]}))}(o);i("a656");var s,r=i("f0c5"),c=Object(r["a"])(n["default"],a["b"],a["c"],!1,null,"e97c33f0",null,!1,a["a"],s);e["default"]=c.exports},f289:function(t,e,i){var a=i("c2cc");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var n=i("4f06").default;n("1f6281cb",a,!0,{sourceMap:!1,shadowMode:!1})}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-list.64a40620.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-list.64a40620.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.a387db6d.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-product-product.a387db6d.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.69ddf572.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-login.69ddf572.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-register.ec60f53e.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-register.ec60f53e.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.35f4c8ae.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-public-webview.35f4c8ae.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-public-webview"],{"07c0":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},"55c3":function(t,n,e){"use strict";e.r(n);var u=e("da10"),r=e("582e");for(var i in r)"default"!==i&&function(t){e.d(n,t,(function(){return r[t]}))}(i);var a,c=e("f0c5"),o=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"fc7509c6",null,!1,u["a"],a);n["default"]=o.exports},"582e":function(t,n,e){"use strict";e.r(n);var u=e("07c0"),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},da10:function(t,n,e){"use strict";var u;e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return i})),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)},i=[]}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.43c543e4.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.43c543e4.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{"219e":function(t,a,e){var n=e("8200");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=e("4f06").default;i("5db22138",n,!0,{sourceMap:!1,shadowMode:!1})},4630:function(t,a,e){"use strict";var n=e("219e"),i=e.n(n);i.a},"6a7a":function(t,a,e){"use strict";e.r(a);var n=e("c5bf"),i=e.n(n);for(var l in n)"default"!==l&&function(t){e.d(a,t,(function(){return n[t]}))}(l);a["default"]=i.a},8200:function(t,a,e){var n=e("24fb");a=n(!1),a.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-633674af]{background:#f8f8f8}.list-cell[data-v-633674af]{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-633674af]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-633674af]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-633674af]{background:#fafafa}.list-cell.b-b[data-v-633674af]:after{left:%?30?%}.list-cell.m-t[data-v-633674af]{margin-top:%?16?%}.list-cell .cell-more[data-v-633674af]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-633674af]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-633674af]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-633674af]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-633674af]{background:#f8f8f8}',""]),t.exports=a},c5bf:function(t,a,e){"use strict";var n=e("4ea4");Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0;var i=n(e("5530")),l=e("2f62"),o={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({content:"确定要退出登录么",success:function(a){a.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var a=t.detail.value?"打开":"关闭";this.$api.msg("".concat(a,"消息推送"))}})};a.default=o},eac0:function(t,a,e){"use strict";e.r(a);var n=e("ee69"),i=e("6a7a");for(var l in i)"default"!==l&&function(t){e.d(a,t,(function(){return i[t]}))}(l);e("4630");var o,c=e("f0c5"),s=Object(c["a"])(i["default"],n["b"],n["c"],!1,null,"633674af",null,!1,n["a"],o);a["default"]=s.exports},ee69:function(t,a,e){"use strict";var n;e.d(a,"b",(function(){return i})),e.d(a,"c",(function(){return l})),e.d(a,"a",(function(){return n}));var i=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("v-uni-view",{staticClass:"container"},[e("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.navTo("/pages/userinfo/userinfo")}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("个人资料")]),e("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),e("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.toLogout.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("退出登录")])],1)],1)},l=[]}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.3ab25707.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.3ab25707.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-userinfo-userinfo.1ab3973a.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-userinfo-userinfo.1ab3973a.js
--- a/addons/unishop/validate/Order.php
+++ b/addons/unishop/validate/Order.php
@@ -18,10 +18,10 @@ class Order extends Validate
    protected $rule = [
        'product_id' => 'require',
        'number' => 'require',
        'city_id' => 'require|integer',
        'delivery_id' => 'require|integer',
 //        'city_id' => 'require|integer',
 //        'delivery_id' => 'require|integer',
        'remark' => 'max:250',
        'address_id' => 'require',
 //        'address_id' => 'require',
        'flash_id' => 'require',
    ];

@@ -31,12 +31,12 @@ class Order extends Validate
    protected $message = [
        'product_id.required' => '产品编号不能为空',
        'number.require' => '商品数量不能为空',
        'city_id.require' => '收货地址不能为空',
        'city_id.integer' => '收货地址格式错误',
        'delivery_id.require' => '请选择配送方式',
        'delivery_id.integer' => '配送方式格式错误',
 //        'city_id.require' => '收货地址不能为空',
 //        'city_id.integer' => '收货地址格式错误',
 //        'delivery_id.require' => '请选择配送方式',
 //        'delivery_id.integer' => '配送方式格式错误',
        'remark.max' => '备注不能超过250个文字',
        'address_id.require' => '请选择收货地址',
 //        'address_id.require' => '请选择收货地址',
        'flash_id.require' => '秒杀id不能为空',
    ];