冲突

components/kj-tabbar/kj-tabbar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view id="tabber" style="position: fixed; z-index: 1000; bottom: 0">
-		<view class="bottom u-flex u-row-between" v-if="value1 == 3">
+		<view class="bottom u-flex u-row-between" v-if="value1 == 2">
 			<view class="u-flex">
 				<u-checkbox-group v-model="all" placement="column" @change="checkAll">
 					<u-checkbox shape="circle" :name="i18n.selectall" activeColor="#F83224">
@@ -101,12 +101,13 @@
 			},
 			list() {
 
-				var list = [{
-						iconPath: "../../static/express1.png",
-						selectedIconPath: "../../static/express2.png",
-						text: "跨境速递",
-						pagePath: "pages/express/express",
-					},
+				var list = [
+					// {
+					// 	iconPath: "../../static/express1.png",
+					// 	selectedIconPath: "../../static/express2.png",
+					// 	text: "跨境速递",
+					// 	pagePath: "pages/express/express",
+					// },
 					{
 						iconPath: "../../static/index1.png",
 						selectedIconPath: "../../static/index2.png",
@@ -132,13 +133,13 @@
 						pagePath: "pages/mine/mine",
 					},
 				];
-				list[2].iconPath = this.ten_yuan_image
-				list[2].selectedIconPath = this.ten_yuan_image
-				list[0].text = this.i18n.border;
-				list[1].text = this.i18n.shop;
-				list[2].text = this.i18n.chase;
-				list[3].text = this.i18n.Shopping;
-				list[4].text = this.i18n.mine;
+				list[1].iconPath = this.ten_yuan_image
+				list[1].selectedIconPath = this.ten_yuan_image
+				// list[0].text = this.i18n.border;
+				list[0].text = this.i18n.shop;
+				list[1].text = this.i18n.chase;
+				list[2].text = this.i18n.Shopping;
+				list[3].text = this.i18n.mine;
 				return list;
 			},
 		},
@@ -262,31 +263,31 @@
 			},
 
 			click1(e) {
-				if (e == 4) {
+				if (e == 3) {
 					uni.switchTab({
 						url: "../../pages/mine/mine",
 					});
 				}
 
-				if (e == 0) {
-					uni.switchTab({
-						url: "../../pages/express/express",
-					});
-				}
+				// if (e == 0) {
+				// 	uni.switchTab({
+				// 		url: "../../pages/express/express",
+				// 	});
+				// }
 
-				if (e == 1) {
+				if (e == 0) {
 					uni.switchTab({
 						url: "../../pages/index/index",
 					});
 				}
 
-				if (e == 2) {
+				if (e == 1) {
 					uni.switchTab({
 						url: "../../pages/shopping/shopping",
 					});
 				}
 
-				if (e == 3) {
+				if (e == 2) {
 					uni.switchTab({
 						url: "../../pages/cart/cart",
 					});

pages/cart/cart.vue

@@ -141,7 +141,7 @@
 			<image class="back-icon" src="../../static/mine/355.png" mode="scaleToFill" />
 			<text class="back-text">{{ i18n.top }}</text>
 		</view>
-		<kj-tabbar ref="tabbar1" :value1="3" :success="success" @allSelect="allSelect" :goodsWeight="goodsWeight"
+		<kj-tabbar ref="tabbar1" :value1="2" :success="success" @allSelect="allSelect" :goodsWeight="goodsWeight"
 			:goodsPrice="String(goodsPrice.toFixed(2))" :goodsList="goodsList" :checkboxValue1="checkboxValue1"
 			@selectDelete="selectDelete"></kj-tabbar>
 	</view>

pages/express/express.vue

@@ -292,7 +292,8 @@
 			if (options.current) {
 				this.current = options.current
 			}
-
+			this.topadd = {} //新建寄件人
+			this.bottomadd = {} //新建收件人
 		},
 		onShow() {
 			this.list[0] = this.i18n.border
@@ -570,6 +571,7 @@
 							bottomadd: function(res) {
 								console.log(res);
 								that.bottomadd = res
+								that.province_id = res.province_id
 							}
 						}
 					})
@@ -580,6 +582,7 @@
 							bottomadd: function(res) {
 								console.log(res);
 								that.bottomadd = res
+								that.province_id = res.province_id
 							}
 						}
 					})

pages/index/index.vue

@@ -244,7 +244,7 @@
 			</view>
 		</u-popup>
 		<view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view>
-		<kj-tabbar :value1=1></kj-tabbar>
+		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
 
@@ -388,7 +388,6 @@
 
 			},
 			advert() {
-				console.log(this.url);
 				uni.navigateTo({
 					url: this.url
 				})

pages/mine/mine.vue

@@ -30,7 +30,7 @@
     <PersonalFunction v-else />
 
     <!-- 底部tab栏 -->
-    <kj-tabbar :value1="4"></kj-tabbar>
+    <kj-tabbar :value1="3"></kj-tabbar>
     <!-- 底部tab栏 -->
   </view>
 </template>

pages/shopping/shopping.vue

@@ -108,7 +108,7 @@
 		</view>
 		<view class="" style="height: 80rpx;"></view>
 		<view class="" style="height: 160rpx;"></view>
-		<kj-tabbar :value1=2></kj-tabbar>
+		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 </template>
 

unpackage/dist/build/mp-weixin/pageD/evaluate/evaluate.wxml

@@ -1 +1 @@
-<view class="data-v-05d99427"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="content data-v-05d99427"><view class="goods-title data-v-05d99427"><image class="goods-img data-v-05d99427" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-05d99427">{{''+item.goods_name+''}}</view></view><view class="rate data-v-05d99427"><view class="_label data-v-05d99427">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+idx}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-05d99427" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+idx}}" accept=" image/*,video/*" fileList="{{fileList0}}" name="0" multiple="{{true}}" maxCount="{{10}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-05d99427" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-05d99427"><u-icon vue-id="{{('4a6a8fa2-3-'+idx)+','+('4a6a8fa2-2-'+idx)}}" name="camera" size="26" class="data-v-05d99427" bind:__l="__l"></u-icon><text class="data-v-05d99427">添加图片/视频</text></view></u-upload><view class="_text data-v-05d99427"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+idx}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-05d99427" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-05d99427" bindtap="__e">提交评价</button></view>
+<view class="data-v-0201308a"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="content data-v-0201308a"><view class="goods-title data-v-0201308a"><image class="goods-img data-v-0201308a" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-0201308a">{{''+item.goods_name+''}}</view></view><view class="rate data-v-0201308a"><view class="_label data-v-0201308a">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+idx}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-0201308a" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+idx}}" accept=" image/*,video/*" fileList="{{fileList0}}" name="0" multiple="{{true}}" maxCount="{{10}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-0201308a" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-0201308a"><u-icon vue-id="{{('4a6a8fa2-3-'+idx)+','+('4a6a8fa2-2-'+idx)}}" name="camera" size="26" class="data-v-0201308a" bind:__l="__l"></u-icon><text class="data-v-0201308a">添加图片/视频</text></view></u-upload><view class="_text data-v-0201308a"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+idx}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-0201308a" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-0201308a" bindtap="__e">提交评价</button></view>

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

@@ -1 +1 @@
-.data-v-05d99427 .u-upload__wrap__preview__image{width:180rpx;height:180rpx}.content.data-v-05d99427{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-05d99427{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-05d99427{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-05d99427{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-05d99427{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-05d99427{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-05d99427{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-05d99427{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-05d99427  .u-textarea{background-color:#fff}.btn-1.data-v-05d99427{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}
+.data-v-0201308a .u-upload__wrap__preview__image{width:180rpx;height:180rpx}.content.data-v-0201308a{background-color:#fff;padding:40rpx 24rpx}.content .goods-title.data-v-0201308a{display:flex;justify-content:flex-start;align-items:center}.content .goods-title .goods-img.data-v-0201308a{width:52rpx;height:52rpx;border-radius:6rpx}.content .goods-title .title.data-v-0201308a{font-size:24rpx;color:rgba(51,51,51,.5);margin-left:20rpx}.content .rate.data-v-0201308a{display:flex;align-items:center;margin-bottom:20rpx}.content .rate ._label.data-v-0201308a{font-size:32rpx;font-weight:600;margin-right:22rpx}.content ._text.data-v-0201308a{margin-top:32rpx;padding-top:26rpx;border-top:2rpx solid hsla(0,0%,59.2%,.1)}.content .upload-photo.data-v-0201308a{width:180rpx;height:180rpx;border:2rpx dashed #979797;border-radius:8rpx;display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:24rpx;color:rgba(34,34,34,.8)}.content.data-v-0201308a  .u-textarea{background-color:#fff}.btn-1.data-v-0201308a{background-color:#f83224;color:#fff;border-radius:40rpx;height:80rpx;line-height:80rpx;width:90%;margin:0 auto;margin-top:70rpx;font-size:32rpx}

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/pages/mine/mine.wxml

@@ -1 +1 @@
-<view class="mine"><view class="mine-top"><image class="header-img" src="{{userInformation.avatar}}" alt></image><view class="user-info"><view class="name">{{userInformation.nickname}}</view><text class="user-id">{{"ID:"+(userInformation.id||'')}}</text></view><block wx:if="{{isTeam}}"><view data-event-opts="{{[['tap',[['toHome',['$event']]]]]}}" class="user-home" bindtap="__e">{{i18n.homepage+''}}<text class="home-right"></text></view></block></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" userInformation="{{userInformation}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{userInformation.merchant}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>
+<view class="mine"><view class="mine-top"><image class="header-img" src="{{userInformation.avatar}}" alt></image><view class="user-info"><view class="name">{{userInformation.nickname}}</view><text class="user-id">{{"ID:"+(userInformation.id||'')}}</text></view><block wx:if="{{isTeam}}"><view data-event-opts="{{[['tap',[['toHome',['$event']]]]]}}" class="user-home" bindtap="__e">{{i18n.homepage+''}}<text class="home-right"></text></view></block></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" userInformation="{{userInformation}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{userInformation.merchant}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{3}}" bind:__l="__l"></kj-tabbar></view>

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
 }