From 7742c67a6c6c837050d478670d50f9c2cc25757e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期二, 23 五月 2023 17:12:48 +0800
Subject: [PATCH] no message
---
uniapp/manifest.json | 18 +++++----
uniapp/nativeplugins/xiguazhu-baichuan/ios/yw_1222_baichuan.jpg | 0
uniapp/.hbuilderx/launch.json | 1
uniapp/App.vue | 32 +---------------
uniapp/pages/active/tmsearch.vue | 6 ++
uniapp/pages/index/index.vue | 21 +++++++---
6 files changed, 32 insertions(+), 46 deletions(-)
diff --git a/uniapp/.hbuilderx/launch.json b/uniapp/.hbuilderx/launch.json
index 99cf98e..aa5b1f5 100644
--- a/uniapp/.hbuilderx/launch.json
+++ b/uniapp/.hbuilderx/launch.json
@@ -25,6 +25,7 @@
},
{
"openVueDevtools" : true,
+ "playground" : "custom",
"type" : "uni-app:app-ios"
}
]
diff --git a/uniapp/App.vue b/uniapp/App.vue
index 360af37..a2558af 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -171,41 +171,13 @@
...mapMutations(['login']),
getAppInfo: function() {
var that = this;
- // #ifdef APP-PLUS
- if (plus.os.name == 'iOS') {
- if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
- that.globalData.ifwt = 0
- } else {
- if (plus.runtime.isApplicationExist({
- action: 'weixin://'
- }) && plus.runtime.isApplicationExist({
- action: 'taobao://'
- })) {
- that.globalData.ifwt = 1 //鏄惁瀹夎寰俊鍜屾窐瀹� 1浠ｈ〃瀹夎
- } else {
- that.globalData.ifwt = 0
- }
- }
- } else {
- if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
- action: 'weixin://'
- })) {
- console.log("瀹夊崜绔凡瀹夎寰俊")
- that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
- } else {
- console.log("瀹夊崜绔湭瀹夎寰俊")
- that.globalData.ifwt = 0
- }
- }
- // #endif
-
this.$u.api.comminInt({}).then(e => {
if (e.code != 0) return that.$alert(e.msg)
that.globalData.appinfo = e.data.basic
utils.setCache('appInfo', e.data.basic)
utils.setCache('baseUrl', this.$u.http.config.baseUrl)
// #ifdef APP-PLUS
- /* if (plus.os.name == 'iOS') {
+ if (plus.os.name == 'iOS') {
if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
that.globalData.ifwt = 0
} else {
@@ -229,7 +201,7 @@
console.log("瀹夊崜绔湭瀹夎寰俊")
that.globalData.ifwt = 0
}
- } */
+ }
// #endif
}).catch(function(err) {})
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index b526fed..b9229cf 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -58,7 +58,7 @@
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
- "abiFilters" : [ "arm64-v8a", "x86" ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"schemes" : "dafanguanapp"
},
/* ios鎵撳寘閰嶇疆 */
@@ -70,6 +70,7 @@
}
],
"urlschemewhitelist" : "tbopen,tmall",
+ "deploymentTarget" : "11.0",
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "涓婁紶澶村儚",
"NSPhotoLibraryAddUsageDescription" : "涓婁紶澶村儚",
@@ -125,10 +126,11 @@
"splashscreen" : {
"androidStyle" : "default",
"android" : {
- "hdpi" : "E:/OPProject/寮�灞�/寮�灞忓皬.png",
- "xhdpi" : "E:/OPProject/寮�灞�/寮�灞忎腑.png",
- "xxhdpi" : "E:/OPProject/寮�灞�/寮�灞忓ぇ.png"
- }
+ "hdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/寮�灞�/寮�灞忓皬.png",
+ "xhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忎腑.png",
+ "xxhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忓ぇ.png"
+ },
+ "iosStyle" : "common"
},
"icons" : {
"android" : {
@@ -170,8 +172,8 @@
"description" : "闃块噷鐧惧窛鎻掍欢 QQ212156620",
"platforms" : "Android,iOS",
"url" : "https://ext.dcloud.net.cn/plugin?id=7186",
- "android_package_name" : "com.dafanguan.app",
- "ios_bundle_id" : "comdafanguanapp",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
"isCloud" : true,
"bought" : 1,
"pid" : "7186",
@@ -184,7 +186,7 @@
"template" : {
//prompt鍙栧�间负template鏃舵湁鏁堬紝鐢ㄤ簬閰嶇疆妯℃澘鎻愮ず妗嗕笂鏄剧ず鐨勫唴瀹�
"title" : "娓╅Θ鎻愮ず",
- "message" : "銆�銆�娆㈣繋浣跨敤App锛屽湪浣犱娇鐢ㄦ椂锛岄渶瑕佽繛鎺ユ暟鎹綉缁滄垨鑰匴IFI锛屼骇鐢熺殑娴侀噺璇峰挩璇㈠綋鍦拌繍钀ュ晢銆傞潪甯搁噸瑙嗕綘鐨勯殣绉佷繚鎶ゅ拰涓汉淇℃伅淇濇姢銆傚湪浣跨敤App鏈嶅姟鍓嶏紝璇疯鐪熼槄璇�<a href='http://xxxxx.cn/index/index/user_agreement'>銆婄敤鎴锋湇鍔″崗璁��</a>鍙�<a href='http://xxxxx.cn/index/index/privacy_agreement'>銆婇殣绉佹斂绛栥��</a>锛屽叏閮ㄦ潯娆俱�備綘鍚屾剰骞舵帴鍙楀叏閮ㄦ潯娆惧悗寮�濮嬩娇鐢ㄦ垜浠殑鏈嶅姟<br/>",
+ "message" : "銆�銆�娆㈣繋浣跨敤App锛屽湪浣犱娇鐢ㄦ椂锛岄渶瑕佽繛鎺ユ暟鎹綉缁滄垨鑰匴IFI锛屼骇鐢熺殑娴侀噺璇峰挩璇㈠綋鍦拌繍钀ュ晢銆傞潪甯搁噸瑙嗕綘鐨勯殣绉佷繚鎶ゅ拰涓汉淇℃伅淇濇姢銆傚湪浣跨敤App鏈嶅姟鍓嶏紝璇疯鐪熼槄璇�<a href='http://dfgapp.ushopvip.com/index/index/user_agreement'>銆婄敤鎴锋湇鍔″崗璁��</a>鍙�<a href='http://dfgapp.ushopvip.com/index/index/privacy_agreement'>銆婇殣绉佹斂绛栥��</a>锛屽叏閮ㄦ潯娆俱�備綘鍚屾剰骞舵帴鍙楀叏閮ㄦ潯娆惧悗寮�濮嬩娇鐢ㄦ垜浠殑鏈嶅姟<br/>",
"buttonAccept" : "鍚屾剰骞剁户缁�", //缁х画涓嬩竴姝ワ紝杩涘叆棣栭〉e
"buttonRefuse" : "涓嶅悓鎰�" //閫�鍑轰笅杞�
}
diff --git a/uniapp/nativeplugins/xiguazhu-baichuan/ios/yw_1222_baichuan.jpg b/uniapp/nativeplugins/xiguazhu-baichuan/ios/yw_1222_baichuan.jpg
index 2f2c7ed..c214b5b 100644
--- a/uniapp/nativeplugins/xiguazhu-baichuan/ios/yw_1222_baichuan.jpg
+++ b/uniapp/nativeplugins/xiguazhu-baichuan/ios/yw_1222_baichuan.jpg
Binary files differ
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
index 033b1a6..1380712 100644
--- a/uniapp/pages/active/tmsearch.vue
+++ b/uniapp/pages/active/tmsearch.vue
@@ -122,7 +122,9 @@
this.$u.api.getTopCalss({ctype:1,parentId:0}).then(e => {
console.log(e);
if(e.code != 0)return that.$alert(e.msg)
+ e.data.list.unshift({cid:"-1",cname:"澶╃尗瓒呭競",ctype:"1"});
e.data.list.unshift({cid:"0",cname:"鍏ㄩ儴",ctype:"1"});
+
that.navList = e.data.list;
that.nowCurrent = that.navList[0].cid
that.getData()
@@ -132,10 +134,12 @@
getData() {
var that = this;
var cateid=that.nowCurrent=="0"?"":that.nowCurrent;
+ var tchaoshi=cateid==-1?1:0;
this.$u.api.getTbGoodsList({
cateId: cateid,
page: this.pageCurrent,
- pageSize: 10
+ pageSize: 10,
+ tchaoshi:tchaoshi
}).then(e => {
console.log(e);
if (e.code != 0) return that.$alert(e.msg)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 667f00d..8bebf3c 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -123,17 +123,24 @@
},
onLoad() {
if(!this.hasLogin){
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
+ setTimeout(function(){
+
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ },3000);
+ return;
}
var user= uni.getStorageSync('userInfo');
if(!user.invitation_code)
{
- uni.reLaunch({
- //url:"/pages/login/setInviteCode"
- url:"/pages/login/wxlogin"
- })
+ setTimeout(function(){
+
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ },3000);
+ return;
}
else
{
--
Gitblit v1.9.3