2023-1-16

mallplusui-uniapp-app/App.vue

@@ -43,12 +43,61 @@
 				this.$db.set('areaGoodsList', list)
 			},
 			async sysInfoMethod() {
+				console.log('sysInfo11111111>>>>>')
 				let params = {};
 				let list = await Api.apiCall('get', Api.index.sysInfo, params);
-				console.log('sysInfo>>>>>', sysInfo)
+				console.log('sysInfo222222222>>>>>', sysInfo)
 				this.$db.set('sysInfo', list)
 			},
 
+			// 获取CID
+			getCid() {
+				// #ifdef APP-PLUS
+				var t1_time = 0;
+				var t1 = setInterval(function() {
+					var cid = plus.push.getClientInfo().clientid;
+					console.log(cid != undefined, cid != "undefined", cid)
+					console.log("cid>>>>>>>>>>", cid)
+					if (cid != null || cid != "null") {
+						uni.setStorageSync('cid', cid);
+						clearInterval(t1);
+						return
+					}
+				}, 130);
+				// #endif
+			},
+			// 监听通知信息
+			handlePush() {
+				// #ifdef APP-PLUS
+				const _handlePush = function(message) {
+
+					console.log("message>>>>>>>>>>", message)
+					uni.setStorageSync('message', message);
+					获取自定义信息
+					let payload = message.payload;
+					
+					// uni.switchTab({
+					// 	url: `${payload.path}`
+					// })
+					
+					// uni.navigateTo({
+					// 	url: '/pages/index/messageDetail',
+					// 	// 版本2.8.9+ 支持
+					// 	success: (res) => {
+					// 		// 和上面其实没差什么,但是这种方式是可以的 这里不是$emit
+					// 		res.eventChannel.emit('sendTestValue', {
+					// 			info: item
+					// 		})
+					// 	}
+					// });
+					
+				}
+				// 事件处理
+				plus.push.addEventListener('click', _handlePush)
+				plus.push.addEventListener('receive', _handlePush)
+				// #endif
+			},
+
 		},
 		onLaunch: function() {
 			// uni.removeStorageSync('userInfo');
@@ -56,8 +105,8 @@
 			console.log('App onLaunch')
 			let userInfo = uni.getStorageSync('userInfo') || '';
 			let token = uni.getStorageSync('token') || '';
-			console.log('App onLaunch>>>',userInfo)
+			console.log('App onLaunch>>>', userInfo)
-			console.log('App onLaunch>>>',token)
+			console.log('App onLaunch>>>', token)
 			if (token) {
 				//更新登陆状态
 				uni.getStorage({
@@ -83,6 +132,44 @@
 			// 	icon: "none"
 			// });
 			// #endif
+
+			this.handlePush();
+			this.getCid();
+			console.log('App onLaunch111111111111>>>', token)
+			// let sss = {
+			// 	"url": "http://mall.yyundong.com/portalapi/api/appVersion/versioninfo",
+			// 	"resolve": {
+			// 		"data": {
+			// 			"code": 200,
+			// 			"data": "{\"id\":null,\"appName\":null,\"versionCode\":1010,\"versionName\":\"1.0.1.0\",\"downloadUrl\":\"http://mall.yyundong.com/apks/mall-1010.apk\",\"versionInfo\":\"BUG修复。\",\"isAlpha\":null,\"fileName\":\"mall-1010.apk\",\"forceUpdate\":false}"
+			// 		},
+			// 		"statusCode": 200,
+			// 		"header": {
+			// 			"X-XSS-Protection": "1; mode=block",
+			// 			"Connection": "keep-alive",
+			// 			"Content-Length": "268",
+			// 			"X-Content-Type-Options": "nosniff",
+			// 			"Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
+			// 			"Date": "Thu, 16 Mar 2023 05:48:35 GMT",
+			// 			"Expires": "0",
+			// 			"X-Frame-Options": "DENY",
+			// 			"Content-Type": "application/json;charset=UTF-8",
+			// 			"Server": "nginx/1.20.2",
+			// 			"Pragma": "no-cache"
+			// 		},
+			// 		"errMsg": "request:ok",
+			// 		"cookies": []
+			// 	},
+			// 	"header": {
+			// 		"Content-Type": "application/json;charset=UTF-8"
+			// 	},
+			// 	"data": {
+			// 		"version": "1010",
+			// 		"type": 1101
+			// 	},
+			// 	"method": "GET"
+			// }
+			// uni.setStorageSync('message', sss);
 		},
 		onShow: function() {
 			console.log('App Show')

mallplusui-uniapp-app/common/api.js

@@ -1,8 +1,8 @@
 import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
-	BASEURI: 'http://192.168.3.9:8083/api/',
+	// BASEURI: 'http://192.168.3.9:8083/api/',
-	// BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
 	// BASEURI: 'http://192.168.31.52:8083/api/',
 	ADMINURI: 'http://mall.yyundong.com/adminapi/',
 	ESURI: 'http://www.yyundong.com:8081/',

mallplusui-uniapp-app/manifest.json

@@ -2,8 +2,8 @@
     "name" : "汇融云链",
     "appid" : "__UNI__FB2C9C4",
     "description" : "",
-    "versionName" : "1.0.1.0",
+    "versionName" : "1.0.1.1",
-    "versionCode" : 1010,
+    "versionCode" : 1011,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
@@ -21,7 +21,8 @@
             "iBeacon" : {},
             "Maps" : {},
             "Camera" : {},
-            "Barcode" : {}
+            "Barcode" : {},
+            "Push" : {}
         },
         "distribute" : {
             "android" : {
@@ -81,7 +82,19 @@
                         "__platform__" : [ "android" ]
                     }
                 },
-                "push" : {},
+                "push" : {
+                    "unipush" : {
+                        "icons" : {
+                            "small" : {
+                                "ldpi" : "static/logo.png",
+                                "mdpi" : "static/logo.png",
+                                "hdpi" : "static/logo.png",
+                                "xhdpi" : "static/logo.png",
+                                "xxhdpi" : "static/logo.png"
+                            }
+                        }
+                    }
+                },
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "8f3a475e0c7c2136efe071f94efb1cae",

mallplusui-uniapp-app/pages/index/user.vue

@@ -130,7 +130,7 @@
 						mode="aspectFill"></image>
 				</scroll-view>
 				<list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的订单"
-					@eventClick="navTo('../../pages/order/order?status=0')"></list-cell>
+					@eventClick="navTo('../../pages/order/order?status=0')" ></list-cell>
 				<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理"
 					@eventClick="navTo('../../pagesU/address/address')"></list-cell>
 				<list-cell icon="icon-tuandui" iconColor="#EE82EE" title="个人资料"
@@ -179,6 +179,9 @@
 				<list-cell icon="icon-shezhi1" iconColor="#e07472" title="系统设置" border=""
 					@eventClick="navTo('/pages/set/set')"></list-cell>
 				<!-- <list-cell icon="icon-shezhi1" iconColor="#e07472" title="test" border="" @eventClick="navTo('/pages/search/test')"></list-cell> -->
+			
+				<!-- <view>{{push}}</view> -->
+			
 			</view>
 		</view>
 		<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
@@ -206,6 +209,8 @@
 		},
 		data() {
 			return {
+				push: "11111111111",
+				cid: "",
 				inputShow: false,
 				feild: undefined,
 				inputContent: '',
@@ -236,6 +241,11 @@
 			this.viewList = []
 			this.listCollect = 0
 			this.getData();
+			let cids = uni.getStorageSync('cid')
+			let message = uni.getStorageSync('message')
+			this.cid = cids
+			this.push = message
+
 		},
 
 		// #ifndef MP
@@ -351,7 +361,7 @@
 					// 		});
 					// 	this.listCollect = orderList.length
 					// }
-						
+
 				}
 			},
 			upData() {

mallplusui-uniapp-app/pages/order/order.vue

@@ -126,7 +126,7 @@
 					},
 					{
 						status: 3,
-						text: '已发货',
+						text: '待收货',
 						loadingType: 'more',
 						orderList: []
 					},

mallplusui-uniapp-app/pages/public/login.vue

@@ -522,7 +522,8 @@
 					// return;
 					let params = {
 						phone: this.phone,
-						authCode: this.code
+						authCode: this.code,
+						cid: uni.getStorageSync('cid')
 					};
 					let data = await Api.apiCall('post', Api.index.loginByCode, params);
 					//this.logining = false;
@@ -548,8 +549,10 @@
 					}
 					let params = {
 						phone: this.phone,
-						password: this.password
+						password: this.password,
+						cid: uni.getStorageSync('cid')
 					};
+						console.log("params>>>>",params);
 					let data = await Api.apiCall('post', Api.index.login, params);
 					if (data) {
 						console.log(data);

mallplusui-uniapp-app/pages/public/reg.vue

@@ -173,7 +173,8 @@
 
 				let params2 = {
 					phone: this.phone,
-					password: this.password
+					password: this.password,
+					cid: uni.getStorageSync('cid')
 				};
 				let data2 = await Api.apiCall('post', Api.index.login, params2);
 				//this.logining = false;