冲突

pageB/recipientinfo.vue

@@ -20,7 +20,9 @@
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.phone}}</text>
-				<view class="right">
+				<view class="right" style="display: flex;">
+				<!-- 	<input style="width: 100rpx;" type="text" placeholder="(+86)" v-model="phone" />
+					<text style="margin-right: 20rpx;">-</text> -->
 					<input type="text" :placeholder="i18n.pleasePhoneNumber" v-model="phone" />
 				</view>
 			</view>

pages/login/login.vue

@@ -14,12 +14,12 @@
 		</button>
 
 
-		<view>
+<!-- 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
 		</view>
 		<button @click="submit">登录</button>
-		<button @click="submita">注册</button>
+		<button @click="submita">注册</button> -->
 		<view class="" style="margin-top: 42rpx; display: flex">
 			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
 				<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }" :name="1">

unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "登录",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u--input": "/uview-ui/components/u--input/u--input",
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
     "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
   }

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,10 +10,15 @@
     "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": {
@@ -32,5 +38,9 @@
       "current": -1,
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

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

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

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
 }