shish 4 лет назад
Родитель
Сommit
50d121ba96
3 измененных файлов с 53 добавлено и 46 удалено
  1. 13 5
      ghsApp/src/admin/home/workbench.vue
  2. 39 40
      ghsApp/src/manifest.json
  3. 1 1
      ghsApp/src/mixins/product.js

+ 13 - 5
ghsApp/src/admin/home/workbench.vue

@@ -3,7 +3,7 @@
 		<!-- 今日概况 -->
 		<div class="user-wrap">
 			<div class="user-top">
-				<div class="app-size-28">今日概况</div><text @click="pageTo({url:'/admin/home/pda'})">PDA开单</text>
+				<div class="app-size-28">今日概况</div><text @click="pageTo({url:'/admin/home/pda?customId=288'})">花店PDA</text>
 			</div>
 			<div class="income-amount">
 				<div>收入金额</div>
@@ -53,8 +53,14 @@
 
 			<!-- 散客和花店开单 -->
 			<view class="tabs-head_bx">
+				<!-- #ifdef MP-WEIXIN -->
 				<image @click="skKd()" :src="skSrc" mode="widthFix"></image>
 				<image @click="pageTo({ url: '/admin/custom/selectCustom',query: {style:1}})" :src="pfSrc" mode="widthFix" ></image>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<image @click="$msg('即将开通')" :src="skSrc" mode="widthFix"></image>
+				<image @click="$msg('即将开通')" :src="pfSrc" mode="widthFix" ></image>
+				<!-- #endif -->
 			</view>
 			
 			<!-- 使用手册 -->
@@ -201,16 +207,18 @@ export default {
 		main.registerReceiver(receiver, filter); //注册监听
 		// #endif
 
-		allProduct().then(res=>{
-			this.allProduct = res.data.list
-		})
-
 	},
 	onPullDownRefresh() {
 		this.init();
 		uni.stopPullDownRefresh();
 	},
 	onShow() {
+
+		//pda扫码开单才需要这个数据
+		allProduct().then(res=>{
+			this.allProduct = res.data.list
+		})
+
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),

+ 39 - 40
ghsApp/src/manifest.json

@@ -11,8 +11,8 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "nvueLaunchMode" : "fast",
-        "compatible": {  
-            "ignoreVersion": true
+        "compatible" : {
+            "ignoreVersion" : true
         },
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
@@ -25,42 +25,8 @@
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ],
-                "autoSdkPermissions" : true
+                "permissions" : [],
+                "autoSdkPermissions" : false
             },
             /* ios打包配置 */
             "ios" : {
@@ -75,9 +41,42 @@
                 "push" : {
                     "unipush" : {}
                 },
-                "share" : {}
+                "share" : {},
+                "ad" : {}
             },
-            "orientation" : [ "portrait-primary" ]
+            "orientation" : [ "portrait-primary" ],
+            "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"
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

+ 1 - 1
ghsApp/src/mixins/product.js

@@ -18,7 +18,7 @@ export default {
 			//id动态切换
 			scroll_into_view:"",
 			timeFun:"",
-			kdType:''//开单方式,notPDA PDA
+			kdType:'notPDA'//开单方式,notPDA PDA
 		};
 	},
 	onLoad(options) {