更新

App.vue

@@ -2,7 +2,7 @@
 import { conn } from "./utils/WebIM";
 import { initEid } from "./mp_ecard_sdk/main";
 // import {
-// 	index
+// 	indexxi
 // } from "@/units/inquire.js"
 export default {
   onLaunch: function () {

commont/http.interceptor.js

@@ -1,75 +1,76 @@
 // 此vm参数为页面的实例，可以通过它引用vuex中的变量
 module.exports = (vm) => {
-	// 初始化请求配置
-	uni.$u.http.setConfig((config) => {
-		/* config 为默认全局配置*/
-		config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
-		return config;
-	});
+  // 初始化请求配置
+  uni.$u.http.setConfig((config) => {
+    /* config 为默认全局配置*/
+    // config.baseURL = "https://cbec.hdlkeji.com"; /* 根域名 */
+    config.baseURL = "https://cbec-test.hdlkeji.com"; /* 根域名，测试地址 */
+    return config;
+  });
 
-	// 请求拦截
-	uni.$u.http.interceptors.request.use(
-		(config) => {
-			// 可使用async await 做异步操作
-			// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
-			config.data = config.data || {};
-			// 根据custom参数中配置的是否需要token，添加对应的请求头
-			// if(config?.custom?.auth) {
-			// 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
-			const token = uni.getStorageSync("token");
-			config.header.Authorization = "Bearer" + " " + token;
-			// }
-			return config;
-		},
-		(config) => {
-			// 可使用async await 做异步操作
-			return Promise.reject(config);
-		}
-	);
+  // 请求拦截
+  uni.$u.http.interceptors.request.use(
+    (config) => {
+      // 可使用async await 做异步操作
+      // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
+      config.data = config.data || {};
+      // 根据custom参数中配置的是否需要token，添加对应的请求头
+      // if(config?.custom?.auth) {
+      // 可以在此通过vm引用vuex中的变量，具体值在vm.$store.state中
+      const token = uni.getStorageSync("token");
+      config.header.Authorization = "Bearer" + " " + token;
+      // }
+      return config;
+    },
+    (config) => {
+      // 可使用async await 做异步操作
+      return Promise.reject(config);
+    }
+  );
 
-	// 响应拦截
-	uni.$u.http.interceptors.response.use(
-		(res) => {
-			/* 对响应成功做点什么 可使用async await 做异步操作*/
-			const data = res.data;
-			// 自定义参数
-			const custom = res.config?.custom;
-			if (data.code !== 10000 && data.code !== 10011) {
-				if (data.code == 10001) {
-					uni.showModal({
-						title: '提示',
-						content: '未登录，请先登录',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								uni.reLaunch({
-									url:'/pages/login/login'
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
+  // 响应拦截
+  uni.$u.http.interceptors.response.use(
+    (res) => {
+      /* 对响应成功做点什么 可使用async await 做异步操作*/
+      const data = res.data;
+      // 自定义参数
+      const custom = res.config?.custom;
+      if (data.code !== 10000 && data.code !== 10011) {
+        if (data.code == 10001) {
+          uni.showModal({
+            title: "提示",
+            content: "未登录，请先登录",
+            success: function (res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+                uni.reLaunch({
+                  url: "/pages/login/login",
+                });
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+        }
 
-				// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
-				else if (custom.toast !== false) {
-					uni.$u.toast(data.message);
-				}
+        // 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
+        else if (custom.toast !== false) {
+          uni.$u.toast(data.message);
+        }
 
-				// 如果需要catch返回，则进行reject
-				if (custom?.catch) {
-					return Promise.reject(data);
-				} else {
-					// 否则返回一个pending中的promise，请求不会进入catch中
-					return new Promise(() => {});
-				}
-			}
-			return data.data === undefined ? {} : data.data;
-		},
-		(res) => {
-			// 对响应错误做点什么 （statusCode !== 200）
-			return Promise.reject(res);
-		}
-	);
-};
+        // 如果需要catch返回，则进行reject
+        if (custom?.catch) {
+          return Promise.reject(data);
+        } else {
+          // 否则返回一个pending中的promise，请求不会进入catch中
+          return new Promise(() => {});
+        }
+      }
+      return data.data === undefined ? {} : data.data;
+    },
+    (res) => {
+      // 对响应错误做点什么 （statusCode !== 200）
+      return Promise.reject(res);
+    }
+  );
+};

unpackage/dist/dev/mp-weixin/pageB/index.js

@@ -1,10 +1,2 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{360:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(361));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},361:function(n,e,t){"use strict";t.r(e);var r=t(362),u=t(364);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageB/index.vue",e["default"]=a.exports},362:function(n,e,t){"use strict";t.r(e);var r=t(363);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},363:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},364:function(n,e,t){"use strict";t.r(e);var r=t(365),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},365:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[360,"common/runtime","common/vendor"]]]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{366:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(367));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},367:function(n,e,t){"use strict";t.r(e);var r=t(368),u=t(370);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageB/index.vue",e["default"]=a.exports},368:function(n,e,t){"use strict";t.r(e);var r=t(369);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},369:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},370:function(n,e,t){"use strict";t.r(e);var r=t(371),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},371:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[366,"common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/index"],{368:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(369));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},369:function(n,e,t){"use strict";t.r(e);var r=t(370),u=t(372);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageB/index.vue",e["default"]=a.exports},370:function(n,e,t){"use strict";t.r(e);var r=t(371);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},371:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},372:function(n,e,t){"use strict";t.r(e);var r=t(373),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},373:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}}};e.default=r}},[[368,"common/runtime","common/vendor"]]]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageB/index.js.map

unpackage/dist/dev/mp-weixin/pageC/accountSecurity/component/textRight.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1196:function(n,t,e){"use strict";e.r(t);var r=e(1197),u=e(1199);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1201);var o,i=e(45),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"eaeef97c",null,!1,r["components"],o);a.options.__file="pageC/accountSecurity/component/textRight.vue",t["default"]=a.exports},1197:function(n,t,e){"use strict";e.r(t);var r=e(1198);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},1198:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return o})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1199:function(n,t,e){"use strict";e.r(t);var r=e(1200),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1200:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={data:function(){return{}},props:{texts:{typeof:String,default:""}}};t.default=r},1201:function(n,t,e){"use strict";e.r(t);var r=e(1202),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1202:function(n,t,e){}}]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1202:function(n,t,e){"use strict";e.r(t);var r=e(1203),u=e(1205);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1207);var o,i=e(45),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"eaeef97c",null,!1,r["components"],o);a.options.__file="pageC/accountSecurity/component/textRight.vue",t["default"]=a.exports},1203:function(n,t,e){"use strict";e.r(t);var r=e(1204);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},1204:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return o})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1205:function(n,t,e){"use strict";e.r(t);var r=e(1206),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1206:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={data:function(){return{}},props:{texts:{typeof:String,default:""}}};t.default=r},1207:function(n,t,e){"use strict";e.r(t);var r=e(1208),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1208:function(n,t,e){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1198:function(n,t,e){"use strict";e.r(t);var r=e(1199),u=e(1201);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1203);var o,i=e(45),a=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"eaeef97c",null,!1,r["components"],o);a.options.__file="pageC/accountSecurity/component/textRight.vue",t["default"]=a.exports},1199:function(n,t,e){"use strict";e.r(t);var r=e(1200);e.d(t,"render",(function(){return r["render"]})),e.d(t,"staticRenderFns",(function(){return r["staticRenderFns"]})),e.d(t,"recyclableRender",(function(){return r["recyclableRender"]})),e.d(t,"components",(function(){return r["components"]}))},1200:function(n,t,e){"use strict";var r;e.r(t),e.d(t,"render",(function(){return u})),e.d(t,"staticRenderFns",(function(){return o})),e.d(t,"recyclableRender",(function(){return c})),e.d(t,"components",(function(){return r}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1201:function(n,t,e){"use strict";e.r(t);var r=e(1202),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1202:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={data:function(){return{}},props:{texts:{typeof:String,default:""}}};t.default=r},1203:function(n,t,e){"use strict";e.r(t);var r=e(1204),u=e.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(c);t["default"]=u.a},1204:function(n,t,e){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/accountSecurity/component/textRight.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/accountSecurity/component/textRight-create-component',
     {
         'pageC/accountSecurity/component/textRight-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1196))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1202))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1198))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/accountSecurity/component/textRight-create-component']]

unpackage/dist/dev/mp-weixin/pageC/addressManagement/component/address.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{1147:function(n,e,t){"use strict";t.r(e);var r=t(1148),u=t(1150);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1152);var d,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"14c53211",null,!1,r["components"],d);a.options.__file="pageC/addressManagement/component/address.vue",e["default"]=a.exports},1148:function(n,e,t){"use strict";t.r(e);var r=t(1149);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1149:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return d})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,d=[];u._withStripped=!0},1150:function(n,e,t){"use strict";t.r(e);var r=t(1151),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1151:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};e.default=r},1152:function(n,e,t){"use strict";t.r(e);var r=t(1153),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1153:function(n,e,t){}}]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{1153:function(n,e,t){"use strict";t.r(e);var r=t(1154),u=t(1156);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1158);var d,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"14c53211",null,!1,r["components"],d);a.options.__file="pageC/addressManagement/component/address.vue",e["default"]=a.exports},1154:function(n,e,t){"use strict";t.r(e);var r=t(1155);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1155:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return d})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,d=[];u._withStripped=!0},1156:function(n,e,t){"use strict";t.r(e);var r=t(1157),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1157:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};e.default=r},1158:function(n,e,t){"use strict";t.r(e);var r=t(1159),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1159:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{1149:function(n,e,t){"use strict";t.r(e);var r=t(1150),u=t(1152);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1154);var d,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"14c53211",null,!1,r["components"],d);a.options.__file="pageC/addressManagement/component/address.vue",e["default"]=a.exports},1150:function(n,e,t){"use strict";t.r(e);var r=t(1151);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1151:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return d})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,d=[];u._withStripped=!0},1152:function(n,e,t){"use strict";t.r(e);var r=t(1153),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1153:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={name:"address",data:function(){return{}},props:{itemInfo:{type:Object,default:{}}},computed:{i18n:function(){return this.$t("index")}},methods:{}};e.default=r},1154:function(n,e,t){"use strict";t.r(e);var r=t(1155),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1155:function(n,e,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/addressManagement/component/address.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/addressManagement/component/address-create-component',
     {
         'pageC/addressManagement/component/address-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1147))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1153))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1149))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

unpackage/dist/dev/mp-weixin/pageC/index.js

@@ -1,10 +1,2 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{484:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(485));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},485:function(n,e,t){"use strict";t.r(e);var r=t(486),u=t(488);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/index.vue",e["default"]=a.exports},486:function(n,e,t){"use strict";t.r(e);var r=t(487);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},487:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},488:function(n,e,t){"use strict";t.r(e);var r=t(489),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},489:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}},created:function(){}};e.default=r}},[[484,"common/runtime","common/vendor"]]]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{490:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(491));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},491:function(n,e,t){"use strict";t.r(e);var r=t(492),u=t(494);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/index.vue",e["default"]=a.exports},492:function(n,e,t){"use strict";t.r(e);var r=t(493);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},493:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},494:function(n,e,t){"use strict";t.r(e);var r=t(495),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},495:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}},created:function(){}};e.default=r}},[[490,"common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/index"],{492:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(493));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},493:function(n,e,t){"use strict";t.r(e);var r=t(494),u=t(496);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);var i,o=t(45),a=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/index.vue",e["default"]=a.exports},494:function(n,e,t){"use strict";t.r(e);var r=t(495);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},495:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,i=[];u._withStripped=!0},496:function(n,e,t){"use strict";t.r(e);var r=t(497),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},497:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={data:function(){return{}},created:function(){}};e.default=r}},[[492,"common/runtime","common/vendor"]]]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pageC/index.js.map

unpackage/dist/dev/mp-weixin/pageC/mineComponent/allRight/allRight.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{1125:function(n,e,t){"use strict";t.r(e);var r=t(1126),u=t(1128);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);t(1130);var a,o=t(45),c=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],a);c.options.__file="pageC/mineComponent/allRight/allRight.vue",e["default"]=c.exports},1126:function(n,e,t){"use strict";t.r(e);var r=t(1127);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1127:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},i=!1,a=[];u._withStripped=!0},1128:function(n,e,t){"use strict";t.r(e);var r=t(1129),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1129:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};e.default=r},1130:function(n,e,t){"use strict";t.r(e);var r=t(1131),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1131:function(n,e,t){}}]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{1131:function(n,e,t){"use strict";t.r(e);var r=t(1132),u=t(1134);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);t(1136);var a,o=t(45),c=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],a);c.options.__file="pageC/mineComponent/allRight/allRight.vue",e["default"]=c.exports},1132:function(n,e,t){"use strict";t.r(e);var r=t(1133);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1133:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},i=!1,a=[];u._withStripped=!0},1134:function(n,e,t){"use strict";t.r(e);var r=t(1135),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1135:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};e.default=r},1136:function(n,e,t){"use strict";t.r(e);var r=t(1137),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1137:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{1127:function(n,e,t){"use strict";t.r(e);var r=t(1128),u=t(1130);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);t(1132);var a,o=t(45),c=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],a);c.options.__file="pageC/mineComponent/allRight/allRight.vue",e["default"]=c.exports},1128:function(n,e,t){"use strict";t.r(e);var r=t(1129);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1129:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return a})),t.d(e,"recyclableRender",(function(){return i})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},i=!1,a=[];u._withStripped=!0},1130:function(n,e,t){"use strict";t.r(e);var r=t(1131),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1131:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{name:{type:String,default:"全部"},withdrawal:{type:Boolean,default:!1}},data:function(){return{}}};e.default=r},1132:function(n,e,t){"use strict";t.r(e);var r=t(1133),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);e["default"]=u.a},1133:function(n,e,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/mineComponent/allRight/allRight.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/allRight/allRight-create-component',
     {
         'pageC/mineComponent/allRight/allRight-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1125))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1131))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1127))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/mineComponent/allRight/allRight-create-component']]

unpackage/dist/dev/mp-weixin/pageC/mineComponent/moneyDetail/index.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{1132:function(n,e,t){"use strict";t.r(e);var r=t(1133),u=t(1135);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1137);var i,c=t(45),a=Object(c["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/mineComponent/moneyDetail/index.vue",e["default"]=a.exports},1133:function(n,e,t){"use strict";t.r(e);var r=t(1134);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1134:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,i=[];u._withStripped=!0},1135:function(n,e,t){"use strict";t.r(e);var r=t(1136),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1136:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};e.default=r},1137:function(n,e,t){"use strict";t.r(e);var r=t(1138),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1138:function(n,e,t){}}]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{1138:function(n,e,t){"use strict";t.r(e);var r=t(1139),u=t(1141);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1143);var i,c=t(45),a=Object(c["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/mineComponent/moneyDetail/index.vue",e["default"]=a.exports},1139:function(n,e,t){"use strict";t.r(e);var r=t(1140);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1140:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,i=[];u._withStripped=!0},1141:function(n,e,t){"use strict";t.r(e);var r=t(1142),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1142:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};e.default=r},1143:function(n,e,t){"use strict";t.r(e);var r=t(1144),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1144:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{1134:function(n,e,t){"use strict";t.r(e);var r=t(1135),u=t(1137);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1139);var i,c=t(45),a=Object(c["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);a.options.__file="pageC/mineComponent/moneyDetail/index.vue",e["default"]=a.exports},1135:function(n,e,t){"use strict";t.r(e);var r=t(1136);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1136:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},o=!1,i=[];u._withStripped=!0},1137:function(n,e,t){"use strict";t.r(e);var r=t(1138),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1138:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{itemInfo:{type:Object,default:{}},withBool:{type:Boolean,default:!1}}};e.default=r},1139:function(n,e,t){"use strict";t.r(e);var r=t(1140),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1140:function(n,e,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/mineComponent/moneyDetail/index.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/mineComponent/moneyDetail/index-create-component',
     {
         'pageC/mineComponent/moneyDetail/index-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1132))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1138))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1134))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/mineComponent/moneyDetail/index-create-component']]

unpackage/dist/dev/mp-weixin/pageC/privacyPolicy/privacyPolicy.js

@@ -1,10 +1,2 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/privacyPolicy/privacyPolicy"],{634:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var i=r(t(635));e.__webpack_require_UNI_MP_PLUGIN__=t,n(i.default)}).call(this,t(1)["default"],t(2)["createPage"])},635:function(e,n,t){"use strict";t.r(n);var r=t(636),i=t(638);for(var c in i)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(c);var u,o=t(45),a=Object(o["default"])(i["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],u);a.options.__file="pageC/privacyPolicy/privacyPolicy.vue",n["default"]=a.exports},636:function(e,n,t){"use strict";t.r(n);var r=t(637);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},637:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return i})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var i=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];i._withStripped=!0},638:function(e,n,t){"use strict";t.r(n);var r=t(639),i=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=i.a},639:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreement:""}},computed:{i18n:function(){return this.$t("index")}},methods:{getAgreement:function(){var n=this;e.$u.http.get("/api/agreement?code=private").then((function(e){n.agreement=e.content_cn}))}},mounted:function(){this.getAgreement(),e.setNavigationBarTitle({title:this.i18n.privacy})}};n.default=t}).call(this,t(2)["default"])}},[[634,"common/runtime","common/vendor"]]]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/privacyPolicy/privacyPolicy"],{640:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var i=r(t(641));e.__webpack_require_UNI_MP_PLUGIN__=t,n(i.default)}).call(this,t(1)["default"],t(2)["createPage"])},641:function(e,n,t){"use strict";t.r(n);var r=t(642),i=t(644);for(var c in i)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(c);var u,o=t(45),a=Object(o["default"])(i["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],u);a.options.__file="pageC/privacyPolicy/privacyPolicy.vue",n["default"]=a.exports},642:function(e,n,t){"use strict";t.r(n);var r=t(643);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},643:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return i})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var i=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];i._withStripped=!0},644:function(e,n,t){"use strict";t.r(n);var r=t(645),i=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=i.a},645:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreement:""}},computed:{i18n:function(){return this.$t("index")}},methods:{getAgreement:function(){var n=this;e.$u.http.get("/api/agreement?code=private").then((function(e){n.agreement=e.content_cn}))}},mounted:function(){this.getAgreement(),e.setNavigationBarTitle({title:this.i18n.privacy})}};n.default=t}).call(this,t(2)["default"])}},[[640,"common/runtime","common/vendor"]]]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/privacyPolicy/privacyPolicy"],{642:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var i=r(t(643));e.__webpack_require_UNI_MP_PLUGIN__=t,n(i.default)}).call(this,t(1)["default"],t(2)["createPage"])},643:function(e,n,t){"use strict";t.r(n);var r=t(644),i=t(646);for(var c in i)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(c);var u,o=t(45),a=Object(o["default"])(i["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],u);a.options.__file="pageC/privacyPolicy/privacyPolicy.vue",n["default"]=a.exports},644:function(e,n,t){"use strict";t.r(n);var r=t(645);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},645:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return i})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var i=function(){var e=this,n=e.$createElement;e._self._c},c=!1,u=[];i._withStripped=!0},646:function(e,n,t){"use strict";t.r(n);var r=t(647),i=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=i.a},647:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={data:function(){return{agreement:""}},computed:{i18n:function(){return this.$t("index")}},methods:{getAgreement:function(){var n=this;e.$u.http.get("/api/agreement?code=private").then((function(e){n.agreement=e.content_cn}))}},mounted:function(){this.getAgreement(),e.setNavigationBarTitle({title:this.i18n.privacy})}};n.default=t}).call(this,t(2)["default"])}},[[642,"common/runtime","common/vendor"]]]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pageC/privacyPolicy/privacyPolicy.js.map

unpackage/dist/dev/mp-weixin/pageC/refundDetail/component/refundInProgress.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{1265:function(n,e,t){"use strict";t.r(e);var r=t(1266),u=t(1268);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1270);var i,d=t(45),c=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"b6b4d5ae",null,!1,r["components"],i);c.options.__file="pageC/refundDetail/component/refundInProgress.vue",e["default"]=c.exports},1266:function(n,e,t){"use strict";t.r(e);var r=t(1267);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1267:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=(n._self._c,n.refundDetail.goods.length),r=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null;n.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},o=!1,i=[];u._withStripped=!0},1268:function(n,e,t){"use strict";t.r(e);var r=t(1269),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1269:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1270:function(n,e,t){"use strict";t.r(e);var r=t(1271),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1271:function(n,e,t){}}]);
-=======
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{1271:function(n,e,t){"use strict";t.r(e);var r=t(1272),u=t(1274);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1276);var d,i=t(45),f=Object(i["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"b6b4d5ae",null,!1,r["components"],d);f.options.__file="pageC/refundDetail/component/refundInProgress.vue",e["default"]=f.exports},1272:function(n,e,t){"use strict";t.r(e);var r=t(1273);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1273:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return d})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=(n._self._c,n.refundDetail.goods.length),r=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null;n.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},o=!1,d=[];u._withStripped=!0},1274:function(n,e,t){"use strict";t.r(e);var r=t(1275),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1275:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};e.default=r},1276:function(n,e,t){"use strict";t.r(e);var r=t(1277),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1277:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{1267:function(n,e,t){"use strict";t.r(e);var r=t(1268),u=t(1270);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1272);var i,d=t(45),c=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"b6b4d5ae",null,!1,r["components"],i);c.options.__file="pageC/refundDetail/component/refundInProgress.vue",e["default"]=c.exports},1268:function(n,e,t){"use strict";t.r(e);var r=t(1269);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1269:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=(n._self._c,n.refundDetail.goods.length),r=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null;n.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},o=!1,i=[];u._withStripped=!0},1270:function(n,e,t){"use strict";t.r(e);var r=t(1271),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1271:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1272:function(n,e,t){"use strict";t.r(e);var r=t(1273),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1273:function(n,e,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{1271:function(n,e,t){"use strict";t.r(e);var r=t(1272),u=t(1274);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1276);var i,d=t(45),c=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"b6b4d5ae",null,!1,r["components"],i);c.options.__file="pageC/refundDetail/component/refundInProgress.vue",e["default"]=c.exports},1272:function(n,e,t){"use strict";t.r(e);var r=t(1273);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1273:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return i})),t.d(e,"recyclableRender",(function(){return o})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement,t=(n._self._c,n.refundDetail.goods.length),r=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?n.refundDetail.goods[0].refund.refund_price.split("."):null;n.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},o=!1,i=[];u._withStripped=!0},1274:function(n,e,t){"use strict";t.r(e);var r=t(1275),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1275:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1276:function(n,e,t){"use strict";t.r(e);var r=t(1277),u=t.n(r);for(var o in r)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(o);e["default"]=u.a},1277:function(n,e,t){}}]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/refundDetail/component/refundInProgress.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundInProgress-create-component',
     {
         'pageC/refundDetail/component/refundInProgress-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1265))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1271))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1267))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/refundDetail/component/refundInProgress-create-component']]

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

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{1258:function(e,n,t){"use strict";t.r(n);var r=t(1259),u=t(1261);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1263);var f,d=t(45),i=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"445aa55e",null,!1,r["components"],f);i.options.__file="pageC/refundDetail/component/refundSuccessful.vue",n["default"]=i.exports},1259:function(e,n,t){"use strict";t.r(n);var r=t(1260);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1260:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return f})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.actual_refund_price.split(".")),r=e.refundDetail.goods[0].refund.actual_refund_price.split("."),u=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:r,g2:u,g3:c}})},c=!1,f=[];u._withStripped=!0},1261:function(e,n,t){"use strict";t.r(n);var r=t(1262),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1262: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},1263:function(e,n,t){"use strict";t.r(n);var r=t(1264),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1264:function(e,n,t){}}]);
-=======
-<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{1264:function(e,n,t){"use strict";t.r(n);var r=t(1265),u=t(1267);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1269);var f,d=t(45),i=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"445aa55e",null,!1,r["components"],f);i.options.__file="pageC/refundDetail/component/refundSuccessful.vue",n["default"]=i.exports},1265:function(e,n,t){"use strict";t.r(n);var r=t(1266);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1266:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return f})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.actual_refund_price.split(".")),r=e.refundDetail.goods[0].refund.actual_refund_price.split("."),u=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:r,g2:u,g3:c}})},c=!1,f=[];u._withStripped=!0},1267:function(e,n,t){"use strict";t.r(n);var r=t(1268),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1268: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},1269:function(e,n,t){"use strict";t.r(n);var r=t(1270),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1270:function(e,n,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{1260:function(e,n,t){"use strict";t.r(n);var r=t(1261),u=t(1263);for(var c in u)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(c);t(1265);var f,d=t(45),i=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"445aa55e",null,!1,r["components"],f);i.options.__file="pageC/refundDetail/component/refundSuccessful.vue",n["default"]=i.exports},1261:function(e,n,t){"use strict";t.r(n);var r=t(1262);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},1262:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return u})),t.d(n,"staticRenderFns",(function(){return f})),t.d(n,"recyclableRender",(function(){return c})),t.d(n,"components",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.actual_refund_price.split(".")),r=e.refundDetail.goods[0].refund.actual_refund_price.split("."),u=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:r,g2:u,g3:c}})},c=!1,f=[];u._withStripped=!0},1263:function(e,n,t){"use strict";t.r(n);var r=t(1264),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1264: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},1265:function(e,n,t){"use strict";t.r(n);var r=t(1266),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(c);n["default"]=u.a},1266:function(e,n,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/refundDetail/component/refundSuccessful.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundSuccessful-create-component',
     {
         'pageC/refundDetail/component/refundSuccessful-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1258))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1264))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1260))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/refundDetail/component/refundSuccessful-create-component']]

unpackage/dist/dev/mp-weixin/pageC/refundDetail/component/refusalToRefund.js

@@ -1,26 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{1272:function(n,e,t){"use strict";t.r(e);var r=t(1273),u=t(1275);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1277);var o,f=t(45),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"7a542f00",null,!1,r["components"],o);i.options.__file="pageC/refundDetail/component/refusalToRefund.vue",e["default"]=i.exports},1273:function(n,e,t){"use strict";t.r(e);var r=t(1274);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1274:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1275:function(n,e,t){"use strict";t.r(e);var r=t(1276),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1276:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1277:function(n,e,t){"use strict";t.r(e);var r=t(1278),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1278:function(n,e,t){}}]);
-=======
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{1278:function(n,e,t){"use strict";t.r(e);var r=t(1279),u=t(1281);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1283);var f,o=t(45),i=Object(o["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"7a542f00",null,!1,r["components"],f);i.options.__file="pageC/refundDetail/component/refusalToRefund.vue",e["default"]=i.exports},1279:function(n,e,t){"use strict";t.r(e);var r=t(1280);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1280:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return f})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,f=[];u._withStripped=!0},1281:function(n,e,t){"use strict";t.r(e);var r=t(1282),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1282:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};e.default=r},1283:function(n,e,t){"use strict";t.r(e);var r=t(1284),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1284:function(n,e,t){}}]);
-=======
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{1274:function(n,e,t){"use strict";t.r(e);var r=t(1275),u=t(1277);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1279);var o,f=t(45),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"7a542f00",null,!1,r["components"],o);i.options.__file="pageC/refundDetail/component/refusalToRefund.vue",e["default"]=i.exports},1275:function(n,e,t){"use strict";t.r(e);var r=t(1276);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1276:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1277:function(n,e,t){"use strict";t.r(e);var r=t(1278),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1278:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1279:function(n,e,t){"use strict";t.r(e);var r=t(1280),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1280:function(n,e,t){}}]);
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{1278:function(n,e,t){"use strict";t.r(e);var r=t(1279),u=t(1281);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1283);var o,f=t(45),i=Object(f["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,"7a542f00",null,!1,r["components"],o);i.options.__file="pageC/refundDetail/component/refusalToRefund.vue",e["default"]=i.exports},1279:function(n,e,t){"use strict";t.r(e);var r=t(1280);t.d(e,"render",(function(){return r["render"]})),t.d(e,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(e,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(e,"components",(function(){return r["components"]}))},1280:function(n,e,t){"use strict";var r;t.r(e),t.d(e,"render",(function(){return u})),t.d(e,"staticRenderFns",(function(){return o})),t.d(e,"recyclableRender",(function(){return c})),t.d(e,"components",(function(){return r}));var u=function(){var n=this,e=n.$createElement;n._self._c},c=!1,o=[];u._withStripped=!0},1281:function(n,e,t){"use strict";t.r(e);var r=t(1282),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1282:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}},computed:{i18n:function(){return this.$t("index")}}};e.default=r},1283:function(n,e,t){"use strict";t.r(e);var r=t(1284),u=t.n(r);for(var c in r)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(c);e["default"]=u.a},1284:function(n,e,t){}}]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pageC/refundDetail/component/refusalToRefund.js.map
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refusalToRefund-create-component',
     {
         'pageC/refundDetail/component/refusalToRefund-create-component':(function(module, exports, __webpack_require__){
-<<<<<<< HEAD
-            __webpack_require__('2')['createComponent'](__webpack_require__(1272))
-=======
-<<<<<<< HEAD
             __webpack_require__('2')['createComponent'](__webpack_require__(1278))
-=======
-            __webpack_require__('2')['createComponent'](__webpack_require__(1274))
->>>>>>> 3d16cb9e92d3e9c4ab43e5638253676145ff1e0d
->>>>>>> 3cbcbe884243faafc8dcf59da2407d3e4523491d
         })
     },
     [['pageC/refundDetail/component/refusalToRefund-create-component']]