冲突

commont/messages.js

@@ -810,7 +810,7 @@ export default {
 			Something: "Cosas buenas del mundo",
 			postage: "Envío gratis",
 			Trade: "Cambiar lo viejo por lo nuevo",
-			sort: "Clasificación",
+			sort: "clase",
 			fill: "Subvenciones",
 			RMB: "RMB",
 			history: "Dirección histórica",
@@ -1157,7 +1157,7 @@ export default {
 			Something: "Il bene globale",
 			postage: "Circostanze eccezionali",
 			Trade: "Cambiare vecchio per nuovo",
-			sort: "classificazione",
+			sort: "tipo",
 			fill: "sovvenzioni",
 			RMB: "RMB",
 			history: "Indirizzo storico",

pageA/productdetails.vue

@@ -1391,7 +1391,7 @@ import list from '../uview-ui/libs/config/props/list';
 		//服务
 		.serve {
 			width: 710rpx;
-			height: 180rpx;
+			// height: 180rpx;
 			background: #ffffff;
 			border-radius: 16rpx;
 			padding: 32rpx 20rpx;

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

@@ -1 +1 @@
-.page.data-v-21dad79b{padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-21dad79b{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-21dad79b{color:#f83224}.page .top-fail.data-v-21dad79b{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-21dad79b{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-21dad79b{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-21dad79b{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-21dad79b{width:100%;height:750rpx}.page .title-price.data-v-21dad79b{background-color:#fff;width:96%;margin:0 auto;border-radius:16rpx;padding-bottom:36rpx;margin-top:20rpx;padding-top:10rpx}.page .price.data-v-21dad79b{color:#f83224;margin-top:6rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-21dad79b{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-21dad79b{font-size:28rpx;padding-left:40rpx;background-color:#fff;width:90%;margin:0 auto;margin-top:40rpx;border-radius:16rpx 16rpx 0 0;padding-top:30rpx}.page .detail.data-v-21dad79b{padding:24rpx 20rpx;background-color:#fff;width:90%;margin:0 auto;border-radius:0 0 16rpx 16rpx}.page .detail .detail-img.data-v-21dad79b{width:100%}.page .footer.data-v-21dad79b{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-21dad79b{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}
+.page.data-v-5b1171ac{padding-bottom:150rpx;margin-top:174rpx}.page .u-top.data-v-5b1171ac{display:flex;width:200rpx;justify-content:space-between}.page .u-top .goods-Detail.data-v-5b1171ac{color:#f83224}.page .top-fail.data-v-5b1171ac{height:60rpx;background-color:#fff1ee;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .top-fail .fail-icon.data-v-5b1171ac{width:32rpx;height:32rpx;margin-right:10rpx}.page .fail.data-v-5b1171ac{height:60rpx;background-color:#fff1d7;padding-left:24rpx;display:flex;align-items:center;font-size:24rpx;color:#333}.page .fail .fail-icon.data-v-5b1171ac{width:32rpx;height:32rpx;margin-right:10rpx}.page .goods-img.data-v-5b1171ac{width:100%;height:750rpx}.page .title-price.data-v-5b1171ac{background-color:#fff;width:96%;margin:0 auto;border-radius:16rpx;padding-bottom:36rpx;margin-top:20rpx;padding-top:10rpx}.page .price.data-v-5b1171ac{color:#f83224;margin-top:6rpx;padding-left:40rpx;font-weight:600}.page .goods-title.data-v-5b1171ac{padding:0 40rpx;font-size:32rpx;margin-top:20rpx}.page .goods-detail.data-v-5b1171ac{font-size:28rpx;padding-left:40rpx;background-color:#fff;width:90%;margin:0 auto;margin-top:40rpx;border-radius:16rpx 16rpx 0 0;padding-top:30rpx}.page .detail.data-v-5b1171ac{padding:24rpx 20rpx;background-color:#fff;width:90%;margin:0 auto;border-radius:0 0 16rpx 16rpx}.page .detail .detail-img.data-v-5b1171ac{width:100%}.page .footer.data-v-5b1171ac{position:fixed;bottom:0;width:100%;padding-bottom:84rpx;padding-top:20rpx;background-color:#fff}.page .footer .btn.data-v-5b1171ac{border-radius:52rpx;background-color:#f83224;color:#fff;border:none;padding:0;margin:0;width:94%;font-size:30rpx;margin:0 auto}

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

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

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

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

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

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

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

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

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

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

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

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

unpackage/dist/dev/mp-weixin/pageA/productdetails.wxss

@@ -421,7 +421,6 @@
 }
 .back .serve.data-v-3f9c3b1e {
   width: 710rpx;
-  height: 180rpx;
   background: #ffffff;
   border-radius: 16rpx;
   padding: 32rpx 20rpx;

unpackage/dist/dev/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>