解决冲突

components/kj-chat/kj-chat.vue

@@ -137,6 +137,7 @@
 
 		methods: {
 			longpressBtn() {
+				console.log(recorderManager);
 				console.log('长按说话');
 				this.longPress = '2';
 				// this.countdown(60); // 倒计时
@@ -158,7 +159,9 @@
 				recorderManager.start(options);
 				// 监听音频开始事件
 				recorderManager.onStart((res) => {})
-				recorderManager.onError((res) => {})
+				recorderManager.onError((res) => {
+					console.log(res);
+				})
 			},
 			// 长按松开录音事件
 			touchendBtn() {

pageC/personalInformation/personalInformation.vue

@@ -12,7 +12,7 @@
 			</view>
 		</view>
 		<view class="bottom" style="">
-			<view class="red" @click="update">保存</view>
+			<view class="red" @click="update">{{i18n.preserve}}</view>
 		</view>
 	</view>
 </template>
@@ -42,13 +42,13 @@
 			}
 			if(uni.getStorageSync('language')){
 				this.language = uni.getStorageSync('language')
-				if(this.language = 'zh-CN'){
+				if(this.language == 'zh-CN'){
 					this.language = 'cn'
-				}else if(this.language = 'en-US'){
+				}else if(this.language == 'en-US'){
 					this.language = 'en'
-				}else if(this.language = 'es-ES'){
+				}else if(this.language == 'es-ES'){
 					this.language = 'es'
-				}else if(this.language = 'it-IT'){
+				}else if(this.language == 'it-IT'){
 					this.language = 'ita'
 				}
 			}

pageC/switchLanguage/switchLanguage.vue

@@ -21,7 +21,8 @@
 	export default {
 		data() {
 			return {
-				languageSelect: ''
+				languageSelect: '',
+				language: 'cn'
 			}
 		},
 
@@ -31,6 +32,15 @@
 			}
 		},
 		methods: {
+			update() {
+				uni.$u.http.post('/api/member/update', {
+					lang: this.language,
+				}).then((res) => {
+					this.$u.toast('切换成功')
+				}).catch(() => {
+
+				})
+			},
 			langChange(e) {
 				const {
 					lang
@@ -38,6 +48,17 @@
 				uni.setStorageSync("language", lang)
 				this._i18n.locale = lang
 				this.languageSelect = lang
+				console.log('languageSelect',this.languageSelect);
+				if (this.languageSelect == 'zh-CN') {
+					this.language = 'cn'
+				} else if (this.languageSelect == 'en-US') {
+					this.language = 'en'
+				} else if (this.languageSelect =='es-ES') {
+					this.language = 'es'
+				} else if (this.languageSelect == 'it-IT') {
+					this.language = 'ita'
+				}
+				this.update()
 				uni.setNavigationBarTitle({
 					title: this.i18n.switchLanguage
 				})

pages/index/index.vue

@@ -285,7 +285,7 @@
 				this.current = options.current
 			}
 			//商品推荐
-			this.HXlogin()
+			
 			
 		},
 		onShow() {
@@ -302,7 +302,7 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
-			
+			this.HXlogin()
 		},
 		methods: {
 			HXlogin() {
@@ -342,7 +342,6 @@
 					}
 				}).then((res) => {
 					console.log(res);
-
 					uni.makePhoneCall({
 						phoneNumber: res.service_mobile
 					})

unpackage/dist/build/mp-weixin/pageC/accountCancellation/accountCancellation.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"0b93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},"2b77":function(n,t,e){"use strict";e.r(t);var u=e("8416"),o=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=o.a},4201:function(n,t,e){},"7f70":function(n,t,e){"use strict";var u=e("4201"),o=e.n(u);o.a},8416:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}};t.default=u},aa81:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var o=u(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c805:function(n,t,e){"use strict";e.r(t);var u=e("0b93"),o=e("2b77");for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e("7f70");var a,i=e("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountCancellation/accountCancellation"],{"0b93":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uModal:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-modal/u-modal")]).then(e.bind(null,"7b40"))}},o=function(){var n=this,t=n.$createElement;n._self._c;n._isMounted||(n.e0=function(t){n.show=!0},n.e1=function(t){n.show=!1})},c=[]},"2b77":function(n,t,e){"use strict";e.r(t);var u=e("8416"),o=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=o.a},4201:function(n,t,e){},"7f709":function(n,t,e){"use strict";var u=e("4201"),o=e.n(u);o.a},8416:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{show:!1}},computed:{i18n:function(){return this.$t("index")}},methods:{logout:function(){this.show=!1}}};t.default=u},aa81:function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f93b");u(e("66fd"));var o=u(e("c805"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(o.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},c805:function(n,t,e){"use strict";e.r(t);var u=e("0b93"),o=e("2b77");for(var c in o)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(c);e("7f709");var a,i=e("f0c5"),r=Object(i["a"])(o["default"],u["b"],u["c"],!1,null,"08d147db",null,!1,u["a"],a);t["default"]=r.exports}},[["aa81","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pageC/personalInformation/personalInformation.wxml

@@ -1 +1 @@
-<view class="page data-v-09507261"><view class="content data-v-09507261"><view class="header data-v-09507261"><text class="data-v-09507261">{{i18n.headerImg}}</text><image class="header-img data-v-09507261" src="{{filePath}}" mode data-event-opts="{{[['tap',[['upimage',['$event']]]]]}}" bindtap="__e"></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-09507261" bindtap="__e"><text class="data-v-09507261">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-09507261" bind:__l="__l"></all-right></view></view><view class="bottom data-v-09507261"><view data-event-opts="{{[['tap',[['update',['$event']]]]]}}" class="red data-v-09507261" bindtap="__e">保存</view></view></view>
+<view class="page data-v-734a9724"><view class="content data-v-734a9724"><view class="header data-v-734a9724"><text class="data-v-734a9724">{{i18n.headerImg}}</text><image class="header-img data-v-734a9724" src="{{filePath}}" mode data-event-opts="{{[['tap',[['upimage',['$event']]]]]}}" bindtap="__e"></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-734a9724" bindtap="__e"><text class="data-v-734a9724">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-734a9724" bind:__l="__l"></all-right></view></view><view class="bottom data-v-734a9724"><view data-event-opts="{{[['tap',[['update',['$event']]]]]}}" class="red data-v-734a9724" bindtap="__e">{{i18n.preserve}}</view></view></view>

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

@@ -1 +1 @@
-.bottom.data-v-09507261{width:750rpx;height:166rpx;background:#fff;padding:16rpx 32rpx 64rpx;position:fixed;bottom:0;left:0;box-sizing:border-box}.red.data-v-09507261{width:686rpx;height:88rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.page.data-v-09507261{padding:20rpx 24rpx}.page .content.data-v-09507261{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .content .header.data-v-09507261{display:flex;justify-content:space-between;align-items:center;height:176rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .content .header .header-img.data-v-09507261{height:116rpx;width:116rpx;border-radius:50%}.page .content .bottom-text.data-v-09507261{display:flex;height:116rpx;justify-content:space-between;align-items:center}
+.bottom.data-v-734a9724{width:750rpx;height:166rpx;background:#fff;padding:16rpx 32rpx 64rpx;position:fixed;bottom:0;left:0;box-sizing:border-box}.red.data-v-734a9724{width:686rpx;height:88rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:88rpx;text-align:center;font-style:normal}.page.data-v-734a9724{padding:20rpx 24rpx}.page .content.data-v-734a9724{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .content .header.data-v-734a9724{display:flex;justify-content:space-between;align-items:center;height:176rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .content .header .header-img.data-v-734a9724{height:116rpx;width:116rpx;border-radius:50%}.page .content .bottom-text.data-v-734a9724{display:flex;height:116rpx;justify-content:space-between;align-items:center}

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"137c":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=r},6333:function(e,n,t){"use strict";var r=t("ed05"),u=t.n(r);u.a},"648a":function(e,n,t){"use strict";var r;t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return f})),t.d(n,"a",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.refund_price.split(".")),r=e.refundDetail.goods[0].refund.refund_price.split("."),u=e.refundDetail.goods[0].refund.refund_price.split("."),f=e.refundDetail.goods[0].refund.refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u,g3:f}})},f=[]},"64e6":function(e,n,t){"use strict";t.r(n);var r=t("137c"),u=t.n(r);for(var f in r)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(f);n["default"]=u.a},9728:function(e,n,t){"use strict";t.r(n);var r=t("648a"),u=t("64e6");for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);t("6333");var i,a=t("f0c5"),c=Object(a["a"])(u["default"],r["b"],r["c"],!1,null,"bf5ef4f0",null,!1,r["a"],i);n["default"]=c.exports},ed05:function(e,n,t){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"137c":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=u},2718:function(e,n,t){},"2ceb":function(e,n,t){"use strict";var u;t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return c})),t.d(n,"a",(function(){return u}));var r=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.actual_refund_price.split(".")),u=e.refundDetail.goods[0].refund.actual_refund_price.split("."),r=e.refundDetail.goods[0].refund.actual_refund_price.split("."),c=e.refundDetail.goods[0].refund.actual_refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:u,g2:r,g3:c}})},c=[]},"64e6":function(e,n,t){"use strict";t.r(n);var u=t("137c"),r=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);n["default"]=r.a},"7ebc":function(e,n,t){"use strict";var u=t("2718"),r=t.n(u);r.a},9728:function(e,n,t){"use strict";t.r(n);var u=t("2ceb"),r=t("64e6");for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);t("7ebc");var f,a=t("f0c5"),i=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,"38b643f0",null,!1,u["a"],f);n["default"]=i.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundSuccessful-create-component',
     {

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.wxml

@@ -1 +1 @@
-<view class="top-direction data-v-bf5ef4f0"><view class="direction-frist data-v-bf5ef4f0"><view class="data-v-bf5ef4f0">退款成功</view><view class="commodity-price data-v-bf5ef4f0"><text style="font-size:20rpx;" class="data-v-bf5ef4f0">￥</text><text class="data-v-bf5ef4f0">{{$root.g0[0]}}</text>.<text style="font-size:20rpx;" class="data-v-bf5ef4f0">{{$root.g1[1]}}</text></view></view><view class="time data-v-bf5ef4f0">2023年12月4号 18:23</view><view class="direction-last data-v-bf5ef4f0"><view class="data-v-bf5ef4f0">退款余额</view><view class="commodity-price data-v-bf5ef4f0"><text style="font-size:20rpx;" class="data-v-bf5ef4f0">￥</text><text class="data-v-bf5ef4f0">{{$root.g2[0]}}</text>.<text style="font-size:20rpx;" class="data-v-bf5ef4f0">{{$root.g3[1]}}</text></view></view><button data-event-opts="{{[['tap',[['$emit',['checkMoney']]]]]}}" class="check data-v-bf5ef4f0" bindtap="__e">查看钱款去向</button></view>
+<view class="top-direction data-v-38b643f0"><view class="direction-frist data-v-38b643f0"><view class="data-v-38b643f0">退款成功</view><view class="commodity-price data-v-38b643f0"><text style="font-size:20rpx;" class="data-v-38b643f0">￥</text><text class="data-v-38b643f0">{{$root.g0[0]}}</text>.<text style="font-size:20rpx;" class="data-v-38b643f0">{{$root.g1[1]}}</text></view></view><view class="time data-v-38b643f0">2023年12月4号 18:23</view><view class="direction-last data-v-38b643f0"><view class="data-v-38b643f0">退款余额</view><view class="commodity-price data-v-38b643f0"><text style="font-size:20rpx;" class="data-v-38b643f0">￥</text><text class="data-v-38b643f0">{{$root.g2[0]}}</text>.<text style="font-size:20rpx;" class="data-v-38b643f0">{{$root.g3[1]}}</text></view></view><button data-event-opts="{{[['tap',[['$emit',['checkMoney']]]]]}}" class="check data-v-38b643f0" bindtap="__e">查看钱款去向</button></view>

unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.wxss

@@ -1 +1 @@
-.top-direction.data-v-bf5ef4f0{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-bf5ef4f0{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-bf5ef4f0{color:#f83224}.top-direction .time.data-v-bf5ef4f0{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-bf5ef4f0{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-bf5ef4f0{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}
+.top-direction.data-v-38b643f0{padding:36rpx 24rpx;border-radius:16rpx;background-color:#fff}.top-direction .direction-frist.data-v-38b643f0{display:flex;justify-content:space-between;align-items:center;font-size:36rpx;font-weight:500}.top-direction .direction-frist .commodity-price.data-v-38b643f0{color:#f83224}.top-direction .time.data-v-38b643f0{color:rgba(34,34,34,.6);font-size:24rpx;margin-top:20rpx}.top-direction .direction-last.data-v-38b643f0{margin-top:32rpx;display:flex;justify-content:space-between;align-items:center;font-size:28rpx;color:#333}.top-direction .check.data-v-38b643f0{margin-top:44rpx;border-radius:38rpx;background-color:#fff;padding:0;border:2rpx solid hsla(0,0%,59.2%,.2);color:#333;font-size:28rpx;height:76rpx}

unpackage/dist/build/mp-weixin/pageC/switchLanguage/switchLanguage.wxml

@@ -1 +1 @@
-<view class="page data-v-42984ad6"><view class="btn-list data-v-42984ad6"><view class="language data-v-42984ad6" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-42984ad6">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-42984ad6" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-42984ad6" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-42984ad6">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-42984ad6" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-42984ad6" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-42984ad6">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-42984ad6" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-42984ad6" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-42984ad6">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-42984ad6" src="../../static/mine/326.png" mode></image></block></view></view></view>
+<view class="page data-v-86196a32"><view class="btn-list data-v-86196a32"><view class="language data-v-86196a32" data-lang="zh-CN" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-86196a32">简体中文</text><block wx:if="{{languageSelect=='zh-CN'}}"><image class="selected data-v-86196a32" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-86196a32" data-lang="en-US" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-86196a32">English</text><block wx:if="{{languageSelect=='en-US'}}"><image class="selected data-v-86196a32" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-86196a32" data-lang="es-ES" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-86196a32">Español</text><block wx:if="{{languageSelect=='es-ES'}}"><image class="selected data-v-86196a32" src="../../static/mine/326.png" mode></image></block></view><view class="language data-v-86196a32" data-lang="it-IT" data-event-opts="{{[['tap',[['langChange',['$event']]]]]}}" bindtap="__e"><text class="data-v-86196a32">Italiano</text><block wx:if="{{languageSelect=='it-IT'}}"><image class="selected data-v-86196a32" src="../../static/mine/326.png" mode></image></block></view></view></view>

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

@@ -1 +1 @@
-.page.data-v-42984ad6{padding:20rpx 24rpx}.page .btn-list.data-v-42984ad6{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-42984ad6{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-42984ad6{width:36rpx;height:36rpx}
+.page.data-v-86196a32{padding:20rpx 24rpx}.page .btn-list.data-v-86196a32{background-color:#fff;border-radius:16rpx;padding:0 20rpx}.page .btn-list .language.data-v-86196a32{display:flex;align-items:center;justify-content:space-between;height:110rpx;border-bottom:2rpx solid hsla(0,0%,59.2%,.2)}.page .btn-list .language .selected.data-v-86196a32{width:36rpx;height:36rpx}

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

@@ -1 +1 @@
-.page.data-v-6466932f{padding:20rpx 24rpx;position:relative}.page .top.data-v-6466932f{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-6466932f{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-6466932f{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-6466932f{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-6466932f{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-6466932f{font-size:26rpx;color:#666}.page .address .address-detail.data-v-6466932f{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-6466932f{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-6466932f{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-6466932f{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}
+.page.data-v-1e3019fe{padding:20rpx 24rpx;position:relative}.page .top.data-v-1e3019fe{background-color:#fff;border-radius:16rpx;padding:28rpx 20rpx}.page .top .top-title.data-v-1e3019fe{font-size:36rpx;color:#333;font-weight:600}.page .top .top-detail.data-v-1e3019fe{font-size:26rpx;color:#a3a3a3;margin-top:10rpx}.page .address.data-v-1e3019fe{background-color:#fff;border-radius:16rpx;padding:34rpx 24rpx 28rpx;margin-top:24rpx}.page .address .name-phone.data-v-1e3019fe{display:flex;align-items:center;align-items:flex-end}.page .address .name-phone .phone.data-v-1e3019fe{font-size:26rpx;color:#666}.page .address .address-detail.data-v-1e3019fe{margin-top:20rpx;font-size:24rpx;color:#444}.page .footer.data-v-1e3019fe{position:fixed;bottom:0;left:0;width:100%;background-color:#fff;height:146rpx;display:flex;justify-content:flex-end;padding:20rpx 20rpx 0 0}.page .footer .btn-1.data-v-1e3019fe{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#f83224;min-width:188rpx;background-color:#fff;border-radius:38rpx;border:2rpx solid #f83224;margin-right:20rpx}.page .footer .btn-2.data-v-1e3019fe{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx}

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,n,e){"use strict";e.r(n);var o=e("cbbd"),i=e("3c0a");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("4f76");var u,r=e("f0c5"),f=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,"69c4d77c",null,!1,o["a"],u);n["default"]=f.exports},"3c0a":function(t,n,e){"use strict";e.r(n);var o=e("65b3"),i=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},"4f76":function(t,n,e){"use strict";var o=e("81fc"),i=e.n(o);i.a},"65b3":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={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{}}};n.default=o},"81fc":function(t,n,e){},cbbd:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var i=function(){var t=this,n=t.$createElement,e=(t._self._c,t.itemInfo.goods.price.split(".")),o=t.itemInfo.goods.price.split("."),i=t.itemInfo.order_goods.total_amount.toFixed(2).split("."),a=t.itemInfo.order_goods.total_amount.toFixed(2).split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:i,g3:a}})},a=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesManage/component/detailCard"],{"34a9":function(t,e,n){"use strict";n.r(e);var o=n("be54"),a=n("3c0a");for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);n("afef");var u,r=n("f0c5"),f=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"582dc4c4",null,!1,o["a"],u);e["default"]=f.exports},"3c0a":function(t,e,n){"use strict";n.r(e);var o=n("65b3"),a=n.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(i);e["default"]=a.a},"65b3":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={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=o},a3a5:function(t,e,n){},afef:function(t,e,n){"use strict";var o=n("a3a5"),a=n.n(o);a.a},be54:function(t,e,n){"use strict";var o;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return o}));var a=function(){var t=this,e=t.$createElement,n=(t._self._c,t.itemInfo.goods.price.split(".")),o=t.itemInfo.goods.price.split("."),a=t.itemInfo.order_goods.total_amount.toFixed(2).split("."),i=t.itemInfo.order_goods.total_amount.toFixed(2).split(".");t.$mp.data=Object.assign({},{$root:{g0:n,g1:o,g2:a,g3:i}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesManage/component/detailCard-create-component',
     {

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/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {

unpackage/dist/dev/.sourcemap/mp-weixin/pageC/common/vendor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["uni-app:///network/api/follow.js"],"names":["getFollowList","data","request","url","method"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAEO,SAASA,aAAa,CAACC,IAAI,EAAE;EAClC,OAAO,IAAAC,aAAO,EAAC;IACbC,GAAG,EAAE,gBAAgB;IACrBC,MAAM,EAAE,KAAK;IACbH,IAAI,EAAJA;EACF,CAAC,CAAC;AACJ,C","file":"pageC/common/vendor.js","sourcesContent":["import { request } from \"../http.js\";\r\n\r\nexport function getFollowList(data) {\r\n  return request({\r\n    url: \"/interest/list\",\r\n    method: \"get\",\r\n    data,\r\n  });\r\n}\r\n"],"sourceRoot":""}
+{"version":3,"sources":["uni-app:///D:/HBuilderX/plugins/uniapp-cli/node_modules/@babel/runtime/helpers/readOnlyError.js"],"names":["_readOnlyError","name","TypeError","module","exports","__esModule"],"mappings":"sGAAA,SAASA,EAAeC,GACtB,MAAM,IAAIC,UAAU,IAAOD,EAAO,kBAEpCE,EAAOC,QAAUJ,EAAgBG,EAAOC,QAAQC,YAAa,EAAMF,EAAOC,QAAQ,WAAaD,EAAOC","file":"pageC/common/vendor.js","sourcesContent":["function _readOnlyError(name) {\n  throw new TypeError(\"\\\"\" + name + \"\\\" is read-only\");\n}\nmodule.exports = _readOnlyError, module.exports.__esModule = true, module.exports[\"default\"] = module.exports;"],"sourceRoot":""}

unpackage/dist/dev/mp-weixin/pageC/common/vendor.js

@@ -0,0 +1,2 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/common/vendor"],{1783:function(o,e){function p(o){throw new TypeError('"'+o+'" is read-only')}o.exports=p,o.exports.__esModule=!0,o.exports["default"]=o.exports}}]);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/pageC/common/vendor.js.map

unpackage/dist/dev/mp-weixin/pageC/personalInformation/personalInformation.wxml

@@ -1 +1 @@
-<view class="page data-v-9ef45c20"><view class="content data-v-9ef45c20"><view class="header data-v-9ef45c20"><text class="data-v-9ef45c20">{{i18n.headerImg}}</text><image class="header-img data-v-9ef45c20" src="{{filePath}}" mode data-event-opts="{{[['tap',[['upimage',['$event']]]]]}}" bindtap="__e"></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-9ef45c20" bindtap="__e"><text class="data-v-9ef45c20">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-9ef45c20" bind:__l="__l"></all-right></view></view><view class="bottom data-v-9ef45c20"><view data-event-opts="{{[['tap',[['update',['$event']]]]]}}" class="red data-v-9ef45c20" bindtap="__e">保存</view></view></view>
+<view class="page data-v-9ef45c20"><view class="content data-v-9ef45c20"><view class="header data-v-9ef45c20"><text class="data-v-9ef45c20">{{i18n.headerImg}}</text><image class="header-img data-v-9ef45c20" src="{{filePath}}" mode data-event-opts="{{[['tap',[['upimage',['$event']]]]]}}" bindtap="__e"></image></view><view data-event-opts="{{[['tap',[['toName',['$event']]]]]}}" class="bottom-text data-v-9ef45c20" bindtap="__e"><text class="data-v-9ef45c20">{{i18n.nickname}}</text><all-right vue-id="6034ed16-1" name="{{nickname}}" class="data-v-9ef45c20" bind:__l="__l"></all-right></view></view><view class="bottom data-v-9ef45c20"><view data-event-opts="{{[['tap',[['update',['$event']]]]]}}" class="red data-v-9ef45c20" bindtap="__e">{{i18n.preserve}}</view></view></view>

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

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.4.3",
   "appid": "wx84ab1b5d609b805d",
   "projectname": "kjds",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

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

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