Commit 1a3c1b2e1cd856d0841af0a5fa290c7a58038c1d

Authored by fengtao
2 parents 6ebca19e 44150a03

Merge branch 'main' into ft_local_dev

... ... @@ -20,8 +20,7 @@
20 20 "Contacts" : {},
21 21 "OAuth" : {},
22 22 "Messaging" : {},
23   - "FaceID" : {},
24   - "Maps" : {}
  23 + "FaceID" : {}
25 24 },
26 25 "distribute" : {
27 26 "android" : {
... ... @@ -51,9 +50,7 @@
51 50 "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
52 51 ]
53 52 },
54   - "ios" : {
55   - "dSYMs" : false
56   - },
  53 + "ios" : {},
57 54 "sdkConfigs" : {
58 55 "ad" : {},
59 56 "geolocation" : {
... ... @@ -66,17 +63,16 @@
66 63 "appkey_android" : ""
67 64 }
68 65 },
69   - "maps" : {
70   - "amap" : {
71   - "appkey_ios" : "5221d1373233c782efac82fb176f7f7d",
72   - "appkey_android" : "5221d1373233c782efac82fb176f7f7d"
73   - }
74   - },
  66 + "maps" : {},
75 67 "oauth" : {}
76 68 },
77 69 "splashscreen" : {
78 70 "androidStyle" : "default",
79   - "android" : {}
  71 + "android" : {
  72 + "hdpi" : "C:/Users/YunTeng/Pictures/logo.png",
  73 + "xhdpi" : "C:/Users/YunTeng/Pictures/logo.png",
  74 + "xxhdpi" : "C:/Users/YunTeng/Pictures/logo.png"
  75 + }
80 76 }
81 77 }
82 78 },
... ... @@ -85,17 +81,16 @@
85 81 "appid" : "wx99c411dc3c5571ef",
86 82 "setting" : {
87 83 "urlCheck" : false,
88   - "minified" : true,
89   - "es6" : true,
  84 + "minified" : false,
  85 + "es6" : false,
90 86 "postcss" : true
91 87 },
92 88 "usingComponents" : true,
93 89 "permission" : {
94 90 "scope.userLocation" : {
95   - "desc" : "如果没有位置信息则使用当前定位"
  91 + "desc" : "你的位置信息将用于小程序位置接口的效果展示"
96 92 }
97 93 },
98   - "requiredPrivateInfos" : [ "getLocation" ],
99 94 "lazyCodeLoading" : "requiredComponents",
100 95 //开启分包优化
101 96 "optimization" : {
... ...
... ... @@ -92,6 +92,7 @@
92 92 </view>
93 93 </view>
94 94 </view>
  95 + <mescroll-empty v-if="!list.length" />
95 96 </mescroll-body>
96 97 <!-- 自带分页组件 -->
97 98 <view style="height: 20rpx"></view>
... ...
... ... @@ -10,6 +10,7 @@
10 10 </view>
11 11 </view>
12 12 </luyj-tree>
  13 + <mescroll-empty v-if="!tree.length" />
13 14 </view>
14 15 </view>
15 16 </template>
... ...
... ... @@ -9,7 +9,8 @@
9 9 <view class="word">{{ item.name }}</view>
10 10 </view>
11 11 </view>
12   - </luyj-tree>
  12 + </luyj-tree>
  13 + <mescroll-empty v-if="!tree.length" />
13 14 </view>
14 15 </view>
15 16 </template>
... ... @@ -45,7 +46,7 @@ export default {
45 46 }
46 47 })
47 48 .catch(e => {
48   - uni.$u.toast(e.data.message);
  49 + // uni.$u.toast(e.data.message);
49 50 });
50 51 },
51 52 confirm(val) {
... ...
... ... @@ -10,7 +10,7 @@
10 10 <text class="device-text">摄像头数:{{ cameraTotal }}</text>
11 11 </view>
12 12 </view>
13   - <view @click="openOrg" class="org-item">
  13 + <view @click="openOrg" class="org-item" >
14 14 <image class="image" src="../../../static/arrow-right.png"></image>
15 15 </view>
16 16 </view>
... ... @@ -30,7 +30,8 @@
30 30 </view>
31 31 </view>
32 32 </view>
33   - </view>
  33 + </view>
  34 + <mescroll-empty v-if="!list.length" />
34 35 </mescroll-body>
35 36 <!-- 自带分页组件 -->
36 37 <view style="height: 60rpx;"></view>
... ...
... ... @@ -19,6 +19,7 @@
19 19 </view>
20 20 </view>
21 21 </view>
  22 + <mescroll-empty v-if="!list.length" />
22 23 </mescroll-body>
23 24 <!-- 自带分页组件 -->
24 25 <view style="height: 60rpx;"></view>
... ...
... ... @@ -256,7 +256,7 @@ export default {
256 256 ...this.bindAccountObj,
257 257 platformName: 'WECHAT',
258 258 thirdUserId: this.getOpenId
259   - };
  259 + };
260 260 uni.$u.http
261 261 .post('/yt/third/bind', postData)
262 262 .then(res => {
... ...