fix：app，小程序，H5条件编译

common/js/env.js

@@ -1,8 +1,8 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
-// let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+// let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
+let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 // let baseUrl = `http://47.108.114.127:10888`
 // let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 

manifest.json

@@ -38,12 +38,50 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "schemes" : "jjeSpreadUniapp"
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages.json

@@ -175,9 +175,14 @@
 		}]
 	},
 	"globalStyle": {
+
+
+		// #ifdef H5
 		"navigationStyle": "custom",
+		// #endif
+
 		"navigationBarTextStyle": "black",
-//		"navigationBarTitleText": "加载中",
+		"navigationBarTitleText": "加载中",
 		"navigationBarBackgroundColor": "#FFE05C",
 		"backgroundColor": "#FFE05C"
 	},

pages/addGroup/addGroup.vue

@@ -27,7 +27,9 @@
 		<view class="addGroup" @click="addGroup">
 			<text>新增</text>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 
 
 		<uni-popup ref="selectPersonPopup" type="bottom">

pages/cooperation/cooperation.vue

@@ -4,7 +4,9 @@
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/directPromotionList/directPromotionList.vue

@@ -4,7 +4,9 @@
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/earningsList/earningsList.vue

@@ -4,7 +4,9 @@
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/forgetPassword/forgetPassword.vue

@@ -29,7 +29,9 @@
 			</view>
 		</view>
 		<u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true" @end="disabled1 = false"></u-code>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 <script>

pages/groupDetail/groupDetail.vue

@@ -57,7 +57,9 @@
 		<view class="addGroup" @click="updateGroupUser">
 			<text>提交</text>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 		<uni-popup ref="selectPersonPopup" type="bottom">
 			<view class="selectMemberPopup">
 				<view class="flex-row justify-around popupTitle">

pages/indirectPromotionList/indirectPromotionList.vue

@@ -20,7 +20,9 @@
 				</view>
 			</mescroll-uni>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 
 	</view>
 </template>

pages/login/login.vue

@@ -1,9 +1,6 @@
 <template>
 	<view class="page">
 		<view class="logTitle">
-<!--			<view class="welcome">-->
-<!--				<text>HI，您好！</text>-->
-<!--			</view>-->
 			<view class="welcome flex-row justify-center">
 				<text>欢迎登录娇骄儿拓客端</text>
 			</view>

pages/myGroup/myGroup.vue

@@ -7,7 +7,9 @@
 		<view class="addGroup" @click="goAddGroup">
 			<text>新增分组</text>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/purchaseCoupon/purchaseCoupon.vue

@@ -39,7 +39,9 @@
 				</view>
 			</view>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 		<uni-popup ref="purchasePopup" type="bottom">
 			<view class="purchasePopup">
 				<view class="flex-row justify-between">

pages/specialistsList/specialistsList.vue

@@ -4,7 +4,9 @@
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/todayEarningsList/todayEarningsList.vue

@@ -23,7 +23,9 @@
 				</view>
 			</mescroll-uni>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/todayPromotionList/todayPromotionList.vue

@@ -19,7 +19,9 @@
 				</view>
 			</mescroll-uni>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 
 	</view>
 </template>

pages/updateGroup/updateGroup.vue

@@ -28,7 +28,9 @@
 		<view class="addGroup" @click="updateGroup">
 			<text>修改</text>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 
 		<uni-popup ref="selectPersonPopup" type="bottom">
 			<view class="selectMemberPopup">

pages/updatePassword/updatePassword.vue

@@ -21,7 +21,9 @@
 				<button class="customStyle"  @click="updatePassword">提交</button>
 			</view>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 	</view>
 </template>
 

pages/userInfo/userInfo.vue

@@ -59,7 +59,9 @@
 		<view  class="logoutButton">
 			<u-button type="error" text="退出登录" @click="logout"></u-button>
 		</view>
+		<!--#ifdef H5-->
 		<liu-drag-button @clickBtn="back">返回</liu-drag-button>
+		<!--#endif-->
 		<u-action-sheet
 				:show="showSex"
 				:actions="actions"