冲突

commont/messages.js

@@ -350,7 +350,14 @@ export default {
 			lowest: '低至',
 			discount: '折扣',
 			newcontainer: '请重新选择货柜',
-			defaultaddress:'设为默认地址'
+			defaultaddress: '设为默认地址',
+
+			information: '请先选择城市和物品信息',
+			Protocol: '请勾选协议',
+			logisticsMethod: '请选择物流方式',
+			selectCourier: '请选择快递公司',
+			trackingNumber: '请填写快递单号',
+			parcelWeight: '请填写包裹重量'
 		},
 	},
 	//英语
@@ -696,7 +703,14 @@ export default {
 			lowest: 'lowest',
 			discount: 'discount',
 			newcontainer: 'Please select a new container',
-			defaultaddress:'Set this parameter to the default address'
+			defaultaddress: 'Set this parameter to the default address',
+
+			information: 'Please select the city and item information first.',
+			Protocol: 'Please tick the agreement.',
+			logisticsMethod: 'Please select the logistics method.',
+			selectCourier: 'Please select the courier company.',
+			trackingNumber: 'Please enter the tracking number.',
+			parcelWeight: 'Please enter the parcel weight.',
 		},
 	},
 	// 西班牙
@@ -867,7 +881,7 @@ export default {
 			service: "servicios",
 			Netcontent: "Contenido neto",
 			sametype: "Mismo modelo bajo precio",
-			review: "comentarios",  
+			review: "comentarios",
 			Productdetails: "Detalles de mercancía",
 			Specification: "Especificaciones y parámetros",
 			Recommended: "Artículos recomendados para",
@@ -1043,7 +1057,14 @@ export default {
 			closeaccount: '¿Está seguro de que desea cerrar su cuenta?',
 			other: 'Otro',
 			store: 'Tienda',
-			defaultaddress:'Establecer como dirección predeterminada'
+			defaultaddress: 'Establecer como dirección predeterminada',
+
+			information: 'Por favor, seleccione primero la ciudad e información del artículo.',
+			Protocol: 'Por favor, marque el acuerdo.',
+			logisticsMethod: 'Por favor, seleccione el método de logística.',
+			selectCourier: 'Por favor, seleccione la empresa de mensajería.',
+			trackingNumber: 'Por favor, introduzca el número de seguimiento del paquete.',
+			parcelWeight: 'Por favor, introduzca el peso del paquete.',
 		},
 	},
 	//意大利
@@ -1061,7 +1082,7 @@ export default {
 			platform: "Regole per le piattaforme",
 			merchant: "Accordo di adesione di un commerciante",
 			layout: "Uscita logon",
-			setup: "Fissazione del numero di conto",  
+			setup: "Fissazione del numero di conto",
 			information: "Dati personali",
 			headerImg: "avatar",
 			nickname: "soprannome",
@@ -1386,7 +1407,14 @@ export default {
 			lowest: 'minimo',
 			discount: 'sconti',
 			newcontainer: 'Per favore riprendete il contenitore',
-			defaultaddress:'Definite l’indirizzo di default'
+			defaultaddress: 'Definite l’indirizzo di default',
+
+			information: 'Seleziona prima la città e le informazioni sull oggetto.',
+			Protocol: 'Seleziona prima il protocollo.',
+			logisticsMethod: 'Seleziona il metodo di logistica.',
+			selectCourier: 'Seleziona la compagnia di corriere.',
+			trackingNumber: 'Inserisci il numero di traccia del pacco.',
+			parcelWeight: 'Inserisci il peso del pacco.',
 		},
 	},
 };

components/kj-tabbar/kj-tabbar.vue

@@ -91,15 +91,16 @@
 				stringcheck: [],
 				skuitemid: [],
 				volume: '',
-				cartid: []
+				cartid: [],
+				ten_yuan_image:''
 			};
 		},
-		onLoad() {},
 		computed: {
 			i18n() {
 				return this.$t("index");
 			},
 			list() {
+
 				var list = [{
 						iconPath: "../../static/express1.png",
 						selectedIconPath: "../../static/express2.png",
@@ -131,6 +132,8 @@
 						pagePath: "pages/mine/mine",
 					},
 				];
+				list[2].iconPath = this.ten_yuan_image
+				list[2].selectedIconPath = this.ten_yuan_image
 				list[0].text = this.i18n.border;
 				list[1].text = this.i18n.shop;
 				list[2].text = this.i18n.chase;
@@ -144,12 +147,25 @@
 			if (uni.getStorageSync("language") != "") {
 				this.language = uni.getStorageSync("language");
 			}
+			this.getimage()
 			// if (uni.getStorageSync('tabbar')!=1) {
 			// 	this.value1 = uni.getStorageSync('tabbar')
 			// }
 			// const dom = uni.createSelectorQuery("#tabber")
 		},
 		methods: {
+			getimage() {
+				uni.$u.http.get('/api/config', {
+					params: {
+						module: 'basic'
+					}
+				}).then((res) => {
+					this.ten_yuan_image = res.ten_yuan_image
+					
+				}).catch(() => {
+
+				})
+			},
 			account() {
 				if (this.checkboxValue1.length == 0) {
 					this.$u.toast('请选择商品')

pageB/delivery.vue

@@ -260,7 +260,7 @@
 						this.$refs.child.transport();
 					}, 800)
 				} else {
-					this.$u.toast('请先选择城市和物品信息')
+					this.$u.toast(this.i18n.information)
 				}
 			},
 			//地址薄
@@ -314,11 +314,11 @@
 			},
 			next() {
 				if (this.checkboxValue1.length == 0) {
-					this.$u.toast('请勾选协议')
+					this.$u.toast(this.i18n.Protocol)
 				} else if (JSON.stringify(this.goodinfo) === '{}') {
-					this.$u.toast('请填写物品信息')
+					this.$u.toast(this.i18n.select)
 				} else if (this.leftname == '') {
-					this.$u.toast('请选择物流方式')
+					this.$u.toast(this.i18n.logisticsMethod)
 				} else {
 					uni.navigateTo({
 						url: "/pageB/end?goodinfo=" + encodeURIComponent(JSON.stringify(this.goodinfo)) +

pageB/end.vue

@@ -146,7 +146,7 @@
 				unit_price: '',
 				number: '',
 				sum: "",
-				code:''
+				code: ''
 			}
 		},
 		onLoad(options) {
@@ -178,14 +178,14 @@
 					goods_name: this.goodinfo.goodname, //樱桃	是	String	商品信息名称
 					goods_num: this.goodinfo.number, //100	是	String	商品数量
 					goods_weight: this.goodinfo.weight, //20	是	String	商品重量
-					goods_length: Number(this.goodinfo.height), //30	是	String	商品体积: 长
+					goods_length: Number(this.goodinfo.length), //30	是	String	商品体积: 长
 					goods_width: Number(this.goodinfo.width), //	40	是	String	商品体积: 宽
 					goods_height: Number(this.goodinfo.height), //	237	是	String	商品体积: 高
 					goods_type: this.goodinfo.goodtype, //normal	是	String	商品类型: normal. 正常商品, special. 特殊商品
-					domestic_logistics_company_code:this.code
+					domestic_logistics_company_code: this.code
 				}).then((res) => {
 					console.log(res)
-					this.$u.toast('下单成功')
+					this.$u.toast(this.i18n.successful)
 					setTimeout(() => {
 						uni.navigateTo({
 							url: '/pageB/orderinfo?orderinfo=' + encodeURIComponent(JSON.stringify(

pageB/parcel.vue

@@ -36,7 +36,7 @@
 				logistics_company_name: '', //	顺丰快递	是	String	快递公司
 				logistics_no: '', //11111111	是	String	快递单号
 				estimated_weight: '', //	222	是	String	包裹重量
-				code:''
+				code: ''
 			};
 		},
 		computed: {
@@ -63,6 +63,18 @@
 			},
 			//线下下单
 			offline() {
+				if (this.logistics_no == '') {
+					this.$u.toast(this.i18n.trackingNumber)
+					return
+				}
+				if (this.logistics_company_name == '') {
+					this.$u.toast(this.i18n.selectCourier)
+					return
+				}
+				if (this.estimated_weight == '') {
+					this.$u.toast(this.i18n.parcelWeight)
+					return
+				}
 				uni.$u.http.post('/api/express-order/offline-create', {
 					logistics_company_code: this.code, //	顺丰快递	是	String	快递公司
 					logistics_no: this.logistics_no, //11111111	是	String	快递单号
@@ -93,6 +105,7 @@
 		text-align: left;
 		font-style: normal;
 	}
+
 	.btn {
 		width: 686rpx;
 		height: 88rpx;

pages/express/express.vue

@@ -344,7 +344,6 @@
 				}).catch(() => {
 
 				})
-
 			},
 			//价格计算
 			calculate() {

uni_modules/liu-waterfall/components/liu-waterfall/liu-waterfall.vue

@@ -26,10 +26,33 @@
 							<text v-if="childItem.weight" style="margin-left: 14rpx;"
 								class="kg">¥{{childItem.weight}}kg</text>
 						</view>
-						<view class="tabs">
+						<!-- 						<view class="tabs">
 							<view class="tab">{{i18n.Proprietary}}</view>
 							<view class="tab">次日达</view>
 							<view class="tab">{{i18n.postage}}</view>
+						</view> -->
+						<view v-if="childItem.label_arr" class="u-flex"
+							style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 6px;overflow: hidden;">
+							<!-- 					<view v-for="(child,idx) in item.label_arr" :key="idx" class="taber"
+								style="border: 1rpx solid #E5BC78;color: #E5BC78;">
+								<text>{{child.name_cn}}</text>
+							</view> -->
+							<view v-for="(child,idx) in childItem.label_arr.slice(0,3)" :key="idx" class="taber"
+								style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
+								<text v-if="language =='zh-CN'">
+									{{child.name_cn}}
+								</text>
+								<text v-if="language =='en-US'">
+									{{child.name_en}}
+								</text>
+								<text v-if="language =='es-ES'">
+									{{child.name_es}}
+								</text>
+								<text v-if="language =='it-IT'">
+									{{child.name_ita}}
+								</text>
+							</view>
+							<!-- <view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">以旧换新</view> -->
 						</view>
 						<view class="">
 							<text class="name">{{childItem.merchant_name}}</text>
@@ -184,6 +207,19 @@
 </script>
 
 <style scoped lang="scss" scoped>
+	.taber {
+		border-radius: 4rpx;
+		padding: 4rpx 8rpx;
+		margin-bottom: 10rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 16rpx;
+		color: #D48700;
+		line-height: 28rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
 	.money {
 		font-family: HarmonyOS_Sans_Medium;
 		font-size: 20rpx;

unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{1796:function(t,n,e){"use strict";var o=e("a82b"),r=e.n(o);r.a},"2c7c":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(t){}},methods:{more:function(){this.show=!this.show}}};n.default=r},"9b65":function(t,n,e){"use strict";e.r(n);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=r.a},a82b:function(t,n,e){},b4ed:function(t,n,e){"use strict";e.r(n);var o=e("cbf0"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(i);e("1796");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"05597344",null,!1,o["a"],u);n["default"]=a.exports},cbf0:function(t,n,e){"use strict";e.d(n,"b",(function(){return r})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var t=this,n=t.$createElement,e=(t._self._c,t.itemInfo.order?t.__map(t.itemInfo.order_goods,(function(n,e){var o=t.__get_orig(n),r=n.sku_item?n.sku_item.price.split("."):null,i=n.sku_item?n.sku_item.price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=t.itemInfo.order?t.itemInfo.order.amount.split("."):null,r=t.itemInfo.order?t.itemInfo.order.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"14e7":function(n,t,e){"use strict";var o=e("a97b"),r=e.n(o);r.a},"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=r},"349a":function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.sku_item?t.discount_price.split("."):null,i=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},a97b:function(n,t,e){},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("349a"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("14e7");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"85cf51b0",null,!1,o["a"],u);t["default"]=a.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/orderForm/component/refundCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{2961:function(e,n,r){"use strict";var u=r("d360"),t=r.n(u);t.a},"67f8":function(e,n,r){"use strict";r.r(n);var u=r("d77c"),t=r.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return u[e]}))}(f);n["default"]=t.a},cd12:function(e,n,r){"use strict";var u;r.d(n,"b",(function(){return t})),r.d(n,"c",(function(){return f})),r.d(n,"a",(function(){return u}));var t=function(){var e=this,n=e.$createElement,r=(e._self._c,e.__map(e.itemInfo.order_goods,(function(n,r){var u=e.__get_orig(n),t=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,f=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,c=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,d=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:c,g3:d}})));e.$mp.data=Object.assign({},{$root:{l0:r}})},f=[]},d360:function(e,n,r){},d77c:function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=u},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("cd12"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("2961");var c,d=r("f0c5"),a=Object(d["a"])(t["default"],u["b"],u["c"],!1,null,"2c47f626",null,!1,u["a"],c);n["default"]=a.exports}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/refundCard"],{1068:function(e,n,r){"use strict";var u;r.d(n,"b",(function(){return t})),r.d(n,"c",(function(){return f})),r.d(n,"a",(function(){return u}));var t=function(){var e=this,n=e.$createElement,r=(e._self._c,e.__map(e.itemInfo.order_goods,(function(n,r){var u=e.__get_orig(n),t=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,f=n.refund&&n.refund.actual_refund_price?n.refund.actual_refund_price.split("."):null,a=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null,c=n.refund&&!n.refund.actual_refund_price?n.refund.refund_price.split("."):null;return{$orig:u,g0:t,g1:f,g2:a,g3:c}})));e.$mp.data=Object.assign({},{$root:{l0:r}})},f=[]},"591d":function(e,n,r){},"67f8":function(e,n,r){"use strict";r.r(n);var u=r("d77c"),t=r.n(u);for(var f in u)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return u[e]}))}(f);n["default"]=t.a},ba90:function(e,n,r){"use strict";var u=r("591d"),t=r.n(u);t.a},d77c:function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:{}},itemInfo:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};n.default=u},e1ce:function(e,n,r){"use strict";r.r(n);var u=r("1068"),t=r("67f8");for(var f in t)["default"].indexOf(f)<0&&function(e){r.d(n,e,(function(){return t[e]}))}(f);r("ba90");var a,c=r("f0c5"),d=Object(c["a"])(t["default"],u["b"],u["c"],!1,null,"ff81aa9e",null,!1,u["a"],a);n["default"]=d.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/refundCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.wxss

@@ -1 +1 @@
-.inp.data-v-77c16a11{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-77c16a11{padding:0 24rpx 50rpx}.top-tab.data-v-77c16a11{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-77c16a11{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-77c16a11{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-77c16a11::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}
+.inp.data-v-49c6cd3e{background-color:#fff;border-radius:40rpx;width:402rpx;padding:0 20rpx;height:68rpx}.content.data-v-49c6cd3e{padding:0 24rpx 50rpx}.top-tab.data-v-49c6cd3e{margin-top:180rpx;display:flex;justify-content:space-between;overflow-y:auto;width:100vw}.top-tab .tab.data-v-49c6cd3e{margin-right:40rpx;font-size:26rpx;color:rgba(34,34,34,.8);flex-shrink:0;height:44rpx;display:flex;align-items:flex-end}.top-tab .commodity.data-v-49c6cd3e{position:relative;font-weight:600;font-size:32rpx}.top-tab .commodity.data-v-49c6cd3e::before{content:"";display:block;height:8rpx;width:100%;background:linear-gradient(90deg,#f83224,#fff);position:absolute;bottom:5rpx;opacity:.8}

unpackage/dist/build/mp-weixin/pageD/afterSalesManage/component/detailCard.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var i=n("c070"),o=n("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);n("b8c6");var s,a=n("f0c5"),f=Object(a["a"])(o["default"],i["b"],i["c"],!1,null,"7a646c26",null,!1,i["a"],s);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var i=n("65b3"),o=n.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);e["default"]=o.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=i},b8c6:function(t,e,n){"use strict";var i=n("fedb"),o=n.n(i);o.a},c070:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return i}));var o=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.sku_item[0].price.split(".")),i=t.itemInfo.goods.sku_item[0].price.split("."),o=t.itemInfo.order_goods.amount.split("."),u=t.itemInfo.order_goods.amount.split("."),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),a=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i,g2:o,g3:u,m0:s,m1:a}})},u=[]},fedb:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var i=n("c0707"),o=n("3c0a");for(var u in o)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(u);n("b8c6");var s,a=n("f0c5"),f=Object(a["a"])(o["default"],i["b"],i["c"],!1,null,"7a646c26",null,!1,i["a"],s);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var i=n("65b3"),o=n.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(u);e["default"]=o.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={props:{itemInfo:{typeof:Object,default:{}}},computed:{model:function(){if(0==this.itemInfo.status)return"filter: blur(5px);"},deliveryStatus:function(){return"0"==this.itemInfo.status?"待退款":"3"==this.itemInfo.status?"平台介入":"2"==this.itemInfo.status?"拒绝退款":"1"==this.itemInfo.status?"已退款":void 0}},data:function(){return{}}};e.default=i},b8c6:function(t,e,n){"use strict";var i=n("fedb"),o=n.n(i);o.a},c0707:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){return i}));var o=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.sku_item[0].price.split(".")),i=t.itemInfo.goods.sku_item[0].price.split("."),o=t.itemInfo.order_goods.amount.split("."),u=t.itemInfo.order_goods.amount.split("."),s=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send),a=(0==t.itemInfo.status||3==t.itemInfo.status)&&Number(t.itemInfo.is_send);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i,g2:o,g3:u,m0:s,m1:a}})},u=[]},fedb:function(t,e,n){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesManage/component/detailCard-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/orderDetail/component/commodityDetail"],{"0d03":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:Number,default:0},commodityInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{avatar:""}},watch:{commodityInformation:function(t){console.log(t),t.member&&(this.avatar=t.member.avatar)}},methods:{application:function(){t.navigateTo({url:"/pageC/applicationRefund/applicationRefund"})}}};n.default=o}).call(this,o("543d")["default"])},5450:function(t,n,o){"use strict";var a=o("7e21"),i=o.n(a);i.a},7736:function(t,n,o){"use strict";var a;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return e})),o.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.commodityInformation.goods,(function(n,o){var a=t.__get_orig(n),i=n.sku_item.price.split("."),e=n.sku_item.price.split(".");return{$orig:a,g0:i,g1:e}}))),a=t.commodityInformation.goods?t.commodityInformation.goods.length:null,i=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null,e=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:o,g2:a,g3:i,g4:e}})},e=[]},"7e21":function(t,n,o){},"931d":function(t,n,o){"use strict";o.r(n);var a=o("7736"),i=o("d2bc");for(var e in i)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(e);o("5450");var r,u=o("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"ff5bfc1a",null,!1,a["a"],r);n["default"]=c.exports},d2bc:function(t,n,o){"use strict";o.r(n);var a=o("0d03"),i=o.n(a);for(var e in a)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return a[t]}))}(e);n["default"]=i.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/orderDetail/component/commodityDetail"],{"0d03":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{status:{typeof:Number,default:0},commodityInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{avatar:""}},watch:{commodityInformation:function(t){console.log(t),t.member&&(this.avatar=t.member.avatar)}},methods:{application:function(){t.navigateTo({url:"/pageC/applicationRefund/applicationRefund"})}}};n.default=o}).call(this,o("543d")["default"])},"46f1":function(t,n,o){"use strict";var a;o.d(n,"b",(function(){return i})),o.d(n,"c",(function(){return e})),o.d(n,"a",(function(){return a}));var i=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.commodityInformation.goods,(function(n,o){var a=t.__get_orig(n),i=n.discount_price.split("."),e=n.discount_price.split(".");return{$orig:a,g0:i,g1:e}}))),a=t.commodityInformation.goods?t.commodityInformation.goods.length:null,i=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null,e=t.commodityInformation.amount?t.commodityInformation.amount.split("."):null;t.$mp.data=Object.assign({},{$root:{l0:o,g2:a,g3:i,g4:e}})},e=[]},"931d":function(t,n,o){"use strict";o.r(n);var a=o("46f1"),i=o("d2bc");for(var e in i)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(e);o("a3a0");var r,c=o("f0c5"),u=Object(c["a"])(i["default"],a["b"],a["c"],!1,null,"1bf51369",null,!1,a["a"],r);n["default"]=u.exports},a3a0:function(t,n,o){"use strict";var a=o("ccb6"),i=o.n(a);i.a},ccb6:function(t,n,o){},d2bc:function(t,n,o){"use strict";o.r(n);var a=o("0d03"),i=o.n(a);for(var e in a)["default"].indexOf(e)<0&&function(t){o.d(n,t,(function(){return a[t]}))}(e);n["default"]=i.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/orderDetail/component/commodityDetail-create-component',
     {

unpackage/dist/build/mp-weixin/pageD/orderDetail/component/commodityDetail.wxss

@@ -1 +1 @@
-.detail.data-v-ff5bfc1a{padding:28rpx 20rpx;background-color:#fff;border-radius:16rpx;margin-top:28rpx}.detail .title.data-v-ff5bfc1a{display:flex;justify-content:space-between}.detail .title .title-left.data-v-ff5bfc1a{display:flex;font-size:32rpx;align-items:center}.detail .title .title-left .header-img.data-v-ff5bfc1a{width:36rpx;height:36rpx;border-radius:50%;margin-right:20rpx}.detail .title .title-left .right-325.data-v-ff5bfc1a{width:32rpx;height:32rpx}.detail .title .order-status.data-v-ff5bfc1a{color:#f83224;font-size:26rpx}.detail .commodity-information.data-v-ff5bfc1a{margin-top:28rpx}.detail .commodity-information .commodity-1.data-v-ff5bfc1a{display:flex;margin-bottom:10rpx}.detail .commodity-information .commodity-1 .commodity-img.data-v-ff5bfc1a{width:180rpx;height:180rpx;margin-right:20rpx;border-radius:10rpx}.detail .commodity-information .commodity-1 .commodity-2.data-v-ff5bfc1a{display:flex;justify-content:space-between}.detail .commodity-information .commodity-1 .commodity-2 .commodity-title.data-v-ff5bfc1a{width:328rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-right:38rpx}.detail .commodity-information .commodity-1 .commodity-3.data-v-ff5bfc1a{display:flex;justify-content:space-between;margin-top:20rpx;color:#777}.detail .commodity-information .commodity-1 .commodity-3 .specifications.data-v-ff5bfc1a{font-size:28rpx;color:#777}.detail .last.data-v-ff5bfc1a{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);padding-bottom:20rpx}.detail .btn-list.data-v-ff5bfc1a{display:flex;justify-content:flex-end;align-items:center}.detail .information.data-v-ff5bfc1a{display:flex;justify-content:space-between;font-size:28rpx;align-items:flex-end;margin-top:34rpx}.detail .information ._label.data-v-ff5bfc1a{font-size:28rpx;color:#333}.detail .information ._title-right.data-v-ff5bfc1a{font-size:28rpx;color:#333;opacity:.6}
+.detail.data-v-1bf51369{padding:28rpx 20rpx;background-color:#fff;border-radius:16rpx;margin-top:28rpx}.detail .title.data-v-1bf51369{display:flex;justify-content:space-between}.detail .title .title-left.data-v-1bf51369{display:flex;font-size:32rpx;align-items:center}.detail .title .title-left .header-img.data-v-1bf51369{width:36rpx;height:36rpx;border-radius:50%;margin-right:20rpx}.detail .title .title-left .right-325.data-v-1bf51369{width:32rpx;height:32rpx}.detail .title .order-status.data-v-1bf51369{color:#f83224;font-size:26rpx}.detail .commodity-information.data-v-1bf51369{margin-top:28rpx}.detail .commodity-information .commodity-1.data-v-1bf51369{display:flex;margin-bottom:10rpx}.detail .commodity-information .commodity-1 .commodity-img.data-v-1bf51369{width:180rpx;height:180rpx;margin-right:20rpx;border-radius:10rpx}.detail .commodity-information .commodity-1 .commodity-2.data-v-1bf51369{display:flex;justify-content:space-between}.detail .commodity-information .commodity-1 .commodity-2 .commodity-title.data-v-1bf51369{width:328rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-right:38rpx}.detail .commodity-information .commodity-1 .commodity-3.data-v-1bf51369{display:flex;justify-content:space-between;margin-top:20rpx;color:#777}.detail .commodity-information .commodity-1 .commodity-3 .specifications.data-v-1bf51369{font-size:28rpx;color:#777}.detail .last.data-v-1bf51369{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);padding-bottom:20rpx}.detail .btn-list.data-v-1bf51369{display:flex;justify-content:flex-end;align-items:center}.detail .information.data-v-1bf51369{display:flex;justify-content:space-between;font-size:28rpx;align-items:flex-end;margin-top:34rpx}.detail .information ._label.data-v-1bf51369{font-size:28rpx;color:#333}.detail .information ._title-right.data-v-1bf51369{font-size:28rpx;color:#333;opacity:.6}

unpackage/dist/build/mp-weixin/pageD/paymentOrder/paymentOrder.wxss

@@ -1 +1 @@
-.page.data-v-15dba3b9{padding:20rpx 24rpx;position:relative}.page ._top.data-v-15dba3b9{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-15dba3b9{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-15dba3b9{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-15dba3b9{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-15dba3b9{font-size:28rpx}.page ._top ._weight.data-v-15dba3b9{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-15dba3b9{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-15dba3b9{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-15dba3b9{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-15dba3b9{width:36rpx;height:36rpx}.page .footer.data-v-15dba3b9{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-15dba3b9{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-15dba3b9{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-15dba3b9{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-15dba3b9{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-15dba3b9{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}
+.page.data-v-2361067a{padding:20rpx 24rpx;position:relative}.page ._top.data-v-2361067a{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-2361067a{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-2361067a{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-2361067a{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-2361067a{font-size:28rpx}.page ._top ._weight.data-v-2361067a{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-2361067a{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-2361067a{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-2361067a{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-2361067a{width:36rpx;height:36rpx}.page .footer.data-v-2361067a{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-2361067a{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-2361067a{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-2361067a{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-2361067a{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-2361067a{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }