冲突

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

@@ -0,0 +1,2 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["mp_ecard_sdk/index/index"],{224:function(n,e,t){"use strict";(function(n,e){var r=t(4);t(26);r(t(25));var u=r(t(225));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t(1)["default"],t(2)["createPage"])},225:function(n,e,t){"use strict";t.r(e);var r=t(226),u=t(228);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(231);var i,d=t(45),o=Object(d["default"])(u["default"],r["render"],r["staticRenderFns"],!1,null,null,null,!1,r["components"],i);o.options.__file="mp_ecard_sdk/index/index.vue",e["default"]=o.exports},226:function(n,e,t){"use strict";t.r(e);var r=t(227);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"]}))},227: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},228:function(n,e,t){"use strict";t.r(e);var r=t(229),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},229:function(n,e,t){"use strict";var r=t(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u=r(t(230)),c=u.default;e.default=c},231:function(n,e,t){"use strict";t.r(e);var r=t(232),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},232:function(n,e,t){}},[[224,"common/runtime","common/vendor"]]]);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/mp_ecard_sdk/index/index.js.map

unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "腾讯云E证通授权",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml

@@ -0,0 +1 @@
+<view class="auth"><view class="auth-logo"><image src="https://faceid-h5-1254418846.file.myqcloud.com/mp_verify_sdk/images/ecard/logo.png"></image></view><view class="title">即将进入"eID数字身份"小程序</view><view class="button-area"><button data-event-opts="{{[['tap',[['handleStart',['$event']]]]]}}" bindtap="__e">确认进入</button></view></view>

unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss

@@ -0,0 +1,2 @@
+.auth{margin-top:128rpx;display:flex;flex-direction:column;align-items:center}.auth-logo{width:200rpx;height:200rpx}.auth-logo image{height:100%;width:100%}.title{margin-top:20rpx;font-size:36rpx;line-height:56rpx}.merchant-name{display:inline;font-weight:700}.sub-title{margin-top:8rpx;font-size:34rpx;line-height:52rpx}.button-area{margin-top:48rpx}.button-area button{width:622rpx;height:96rpx;background:#fff;border:2rpx solid #ddd;font-size:32rpx;font-weight:400;line-height:96rpx;padding:0}.redirect{margin-top:272rpx;display:flex;flex-direction:column;align-items:center}.loading{height:160rpx;width:160rpx;margin-bottom:32rpx}.loading image{height:100%;width:100%}.title{font-size:34rpx;line-height:52rpx}
+

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

@@ -1,18 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/accountSecurity/component/textRight"],{1184:function(n,t,e){"use strict";e.r(t);var r=e(1185),u=e(1187);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e(1189);var o,i=e(37),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},1185:function(n,t,e){"use strict";e.r(t);var r=e(1186);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"]}))},1186: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},1187:function(n,t,e){"use strict";e.r(t);var r=e(1188),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},1188: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},1189:function(n,t,e){"use strict";e.r(t);var r=e(1190),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},1190: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){}}]);
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
 //# 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__(1184))
-=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1198))
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
         })
     },
     [['pageC/accountSecurity/component/textRight-create-component']]

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

@@ -1,18 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/addressManagement/component/address"],{1135:function(n,e,t){"use strict";t.r(e);var r=t(1136),u=t(1138);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t(1140);var d,o=t(37),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},1136:function(n,e,t){"use strict";t.r(e);var r=t(1137);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"]}))},1137: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},1138:function(n,e,t){"use strict";t.r(e);var r=t(1139),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},1139: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},1140:function(n,e,t){"use strict";t.r(e);var r=t(1141),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},1141: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){}}]);
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
 //# 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__(1135))
-=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1149))
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
         })
     },
     [['pageC/addressManagement/component/address-create-component']]

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

@@ -1,18 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/allRight/allRight"],{1113:function(n,e,t){"use strict";t.r(e);var r=t(1114),u=t(1116);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);t(1118);var a,o=t(37),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},1114:function(n,e,t){"use strict";t.r(e);var r=t(1115);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"]}))},1115: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},1116:function(n,e,t){"use strict";t.r(e);var r=t(1117),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},1117: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},1118:function(n,e,t){"use strict";t.r(e);var r=t(1119),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},1119: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){}}]);
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
 //# 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__(1113))
-=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1127))
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
         })
     },
     [['pageC/mineComponent/allRight/allRight-create-component']]

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

@@ -1,18 +1,10 @@
-<<<<<<< HEAD
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/mineComponent/moneyDetail/index"],{1120:function(n,e,t){"use strict";t.r(e);var r=t(1121),u=t(1123);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);t(1125);var i,c=t(37),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},1121:function(n,e,t){"use strict";t.r(e);var r=t(1122);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"]}))},1122: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},1123:function(n,e,t){"use strict";t.r(e);var r=t(1124),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},1124: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},1125:function(n,e,t){"use strict";t.r(e);var r=t(1126),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},1126: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){}}]);
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
 //# 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__(1120))
-=======
             __webpack_require__('2')['createComponent'](__webpack_require__(1134))
->>>>>>> ac10556e38136e0665c908a8fcf022813c79b158
         })
     },
     [['pageC/mineComponent/moneyDetail/index-create-component']]