Merge pull request 'xbx' (#73) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/73

App.vue

@@ -6,6 +6,15 @@ export default {
 	onLaunch: function() {
 		getApp().globalData.im = this.imService
 		console.log('App Launch');
+        // 缓存token
+        uni.getStorage({
+        	key: "token",
+        	success: (res) => {
+        		uni.switchTab({
+        		    url: "/pages/index/index"
+        		})
+        	}
+        })
 	},
 	onShow: function() {
 		console.log('App Show');

manifest.json

@@ -64,13 +64,13 @@
             },
             "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"
+                    "hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
+                    "xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
+                    "xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
+                    "xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
                     "ipad" : {
                         "app" : "unpackage/res/icons/76x76.png",
                         "app@2x" : "unpackage/res/icons/152x152.png",
@@ -83,14 +83,14 @@
                         "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"
+                        "app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
+                        "app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
+                        "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
+                        "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG",
+                        "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
+                        "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
+                        "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
+                        "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG"
                     }
                 }
             },
@@ -98,6 +98,12 @@
                 "iosStyle" : "storyboard",
                 "ios" : {
                     "storyboard" : "E:/Source-code/deming/static/CustomStoryboard.zip"
+                },
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
+                    "xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
+                    "xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
                 }
             }
         }

pages/index/details.vue

@@ -124,7 +124,7 @@
 		></u-picker>
 		<u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">填写快递单号</view>
-			<view class="input-info"><input type="text" placeholder="请输入快递单号" v-model="pushid" /></view>
+			<view class="input-info"><input type="text" style="color: #333; line-height: 1;" placeholder="请输入快递单号" v-model="pushid" /></view>
 			<view class="btn" @click="showExpress = false">确认</view>
 		</u-popup>
 		<u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">

pages/login/login.vue

@@ -112,7 +112,6 @@ export default {
 							type: 'error'
 						});
 					} else {
-
 						uni.setStorageSync('token', res.data.token);
 						uni.setStorageSync('userinfo', res.data);
 						uni.setStorageSync('rongyun', res.data.rongcloud_token);