1

Source/group-platform-app/main.js → Source/merchant-app/main.js

@@ -10,6 +10,13 @@ Vue.component('cu-custom',cuCustom)
 import comSelectPicture from './components/comSelectPicture/comSelectPicture.vue'
 Vue.component('com-select-picture',comSelectPicture)
 
+//oss图片服务器
+// Vue.prototype.$ossUrl = function(img){
+// 	return  "https://cdn.uxianxin.com/app/group/"+img;
+// };
+
+Vue.prototype.$ossUrl = 'http://cdn.uxianxin.com/app/group/login/bg-top.png'
+
 
 // 此处为vuex使用
 import store from '@/store';

Source/group-platform-app/manifest.json → Source/merchant-app/manifest.json

@@ -50,7 +50,8 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "maps" : {}
             }
         }
     },
@@ -76,5 +77,14 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "5PZBZ-YGQCV-ZAYPQ-UINXO-AYKW3-NJB35"
+                }
+            }
+        }
+    }
 }

Source/group-platform-app/pages.json → Source/merchant-app/pages.json

@@ -4,6 +4,14 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+		    "path" : "pages/login/login",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		}
+		,{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "物业"
@@ -16,7 +24,6 @@
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-            
         }
     ],
 	"globalStyle": {

Source/merchant-app/pages/login/login.vue

@@ -0,0 +1,48 @@
+<template>
+	<view class="add" @tap="aa">
+        <view class="mine"></view>
+	</view>
+    
+    <!-- http://cdn.uxianxin.com/app/group/login/bg-top.png -->
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			aa() {
+                uni.chooseLocation({
+                    success: function (res) {
+                        console.log(res)
+                        console.log('位置名称：' + res.name);
+                        console.log('详细地址：' + res.address);
+                        console.log('纬度：' + res.latitude);
+                        console.log('经度：' + res.longitude);
+                    }
+                });
+            }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+.add {
+    background-image: url('http://cdn.uxianxin.com/app/group/login/bg-top.png');
+	height: 100vh;
+    background-size: 100% auto;
+    background-repeat: no-repeat;
+    padding-top: 340rpx;
+}
+.mine {
+    background-image: url('http://cdn.uxianxin.com/app/group/login/bg-mine.png');
+	height: calc(100vh - 340rpx);
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    
+}
+</style>

Source/group-platform-app/unpackage/dist/dev/app-plus/app-config-service.js → Source/merchant-app/unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/main/main"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"共享车位","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"custom"},"tabBar":{"color":"#333333","selectedColor":"#fc6035","borderStyle":"black","fontSize":"11","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"static/tab/index.png","selectedIconPath":"static/tab/index-H.png","text":"首页"},{"pagePath":"pages/main/main","iconPath":"static/tab/mine.png","selectedIconPath":"static/tab/mine-H.png","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"group-platform-app","compilerVersion":"3.4.7","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"物业"}},{"path":"/pages/main/main","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/login/login","pages/index/index","pages/main/main"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"共享车位","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","navigationStyle":"custom"},"tabBar":{"color":"#333333","selectedColor":"#fc6035","borderStyle":"black","fontSize":"11","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"static/tab/index.png","selectedIconPath":"static/tab/index-H.png","text":"首页"},{"pagePath":"pages/main/main","iconPath":"static/tab/mine.png","selectedIconPath":"static/tab/mine-H.png","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"group-platform-app","compilerVersion":"3.4.7","entryPagePath":"pages/login/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login/login","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"物业"}},{"path":"/pages/main/main","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});