冲突

unpackage/dist/build/mp-weixin/components/kj-tabbar/kj-tabbar.wxss

@@ -1 +1 @@
-.all.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-4df7efb3{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-4df7efb3{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-4df7efb3{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-4df7efb3{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-4df7efb3{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}
+.all.data-v-690f0e00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal}.bottom.data-v-690f0e00{width:750rpx;height:100rpx;background:#fff;padding:0 24rpx;box-sizing:border-box}.bottom .dle.data-v-690f0e00{width:136rpx;height:60rpx;text-align:center;line-height:60rpx;border-radius:38rpx;border:2rpx solid #979797;font-size:26rpx;color:#333}.bottom .allweight.data-v-690f0e00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .sum.data-v-690f0e00{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:22rpx;color:#333;line-height:32rpx;text-align:left;font-style:normal}.bottom .summon.data-v-690f0e00{font-family:JDZhengHT;font-weight:400;font-size:24rpx;color:#ff1515;line-height:30rpx;text-align:left;font-style:normal}.bottom .settle.data-v-690f0e00{width:176rpx;height:68rpx;background:#f83224;border-radius:38rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#fff;line-height:68rpx;text-align:center;font-style:normal;margin-left:20rpx}

unpackage/dist/build/mp-weixin/pageA/comment.wxml

@@ -1 +1 @@
-<view class="back data-v-c9b9cbfa"><block wx:if="{{$root.g0>0}}"><view class="data-v-c9b9cbfa"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-c9b9cbfa"><view style="display:flex;justify-content:space-between;" class="data-v-c9b9cbfa"><view class="u-flex data-v-c9b9cbfa"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-c9b9cbfa"></image><view class="data-v-c9b9cbfa"><text class="name data-v-c9b9cbfa">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-c9b9cbfa" bind:__l="__l"></uni-rate></view></view><text class="day data-v-c9b9cbfa">{{item.m0}}</text></view><view class="day data-v-c9b9cbfa" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-c9b9cbfa" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-c9b9cbfa" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-c9b9cbfa"></image></block></view></block></view></block></view></block><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-c9b9cbfa">{{''+i18n.nodata+''}}</view></view>
+<view class="back data-v-16c7b8a7"><block wx:if="{{$root.g0>0}}"><view class="data-v-16c7b8a7"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-16c7b8a7"><view style="display:flex;justify-content:space-between;" class="data-v-16c7b8a7"><view class="u-flex data-v-16c7b8a7"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-16c7b8a7"></image><view class="data-v-16c7b8a7"><text class="name data-v-16c7b8a7">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-16c7b8a7" bind:__l="__l"></uni-rate></view></view><text class="day data-v-16c7b8a7">{{item.m0}}</text></view><view class="day data-v-16c7b8a7" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-16c7b8a7" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-16c7b8a7" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-16c7b8a7"></image></block></view></block></view></block></view></block><block wx:else><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-16c7b8a7">{{''+i18n.nodata+''}}</view></block></view>

unpackage/dist/build/mp-weixin/pageA/comment.wxss

@@ -1 +1 @@
-.back.data-v-c9b9cbfa{padding:20rpx;box-sizing:border-box}.back .box.data-v-c9b9cbfa{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-c9b9cbfa{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-c9b9cbfa{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-c9b9cbfa{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}
+.back.data-v-16c7b8a7{padding:20rpx;box-sizing:border-box}.back .box.data-v-16c7b8a7{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-16c7b8a7{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-16c7b8a7{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-16c7b8a7{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}

unpackage/dist/build/mp-weixin/pageA/service/service.json

@@ -4,6 +4,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "kj-chat": "/components/kj-chat/kj-chat"
   }
 }

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-page.data-v-7bad7cb4{background-color:#fff!important;height:100vh}.login-btn.data-v-7bad7cb4{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-7bad7cb4{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}
+page.data-v-5aa43d3d{background-color:#fff!important;height:100vh}.login-btn.data-v-5aa43d3d{width:662rpx;height:96rpx;background:#f83224;box-shadow:0rpx 16rpx 40rpx -12rpx rgba(255,21,21,.5);border-radius:48rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:96rpx;text-align:center;font-style:normal}.fontYin.data-v-5aa43d3d{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#666;line-height:34rpx;text-align:left;font-style:normal}

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/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

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