Explorar el Código

登录注册页面

wang1875062@163.com hace 2 años
padre
commit
535f18fea4
Se han modificado 24 ficheros con 209 adiciones y 302 borrados
  1. 1 1
      Source/merchant-app/main.js
  2. 35 5
      Source/merchant-app/pages.json
  3. 8 3
      Source/merchant-app/pages/data/data.vue
  4. 10 10
      Source/merchant-app/pages/index/index.vue
  5. 7 2
      Source/merchant-app/pages/login/login.vue
  6. 24 21
      Source/merchant-app/pages/login/loginCode.vue
  7. 30 0
      Source/merchant-app/pages/mine/mine.vue
  8. 30 0
      Source/merchant-app/pages/order/order.vue
  9. BIN
      Source/merchant-app/static/tab/data.png
  10. BIN
      Source/merchant-app/static/tab/index-H.png
  11. BIN
      Source/merchant-app/static/tab/index.png
  12. BIN
      Source/merchant-app/static/tab/mine-H.png
  13. BIN
      Source/merchant-app/static/tab/mine.png
  14. BIN
      Source/merchant-app/static/tab/order.png
  15. 2 2
      Source/merchant-app/unpackage/dist/dev/app-plus/app-config-service.js
  16. 0 0
      Source/merchant-app/unpackage/dist/dev/app-plus/app-service.js
  17. 62 258
      Source/merchant-app/unpackage/dist/dev/app-plus/app-view.js
  18. 0 0
      Source/merchant-app/unpackage/dist/dev/app-plus/manifest.json
  19. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/data.png
  20. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/index-H.png
  21. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/index.png
  22. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/mine-H.png
  23. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/mine.png
  24. BIN
      Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/order.png

+ 1 - 1
Source/merchant-app/main.js

@@ -14,7 +14,7 @@ Vue.component('com-select-picture',comSelectPicture)
 Vue.prototype.$ossUrl = function(img){
 	return  "https://cdn.uxianxin.com/app/group/"+img;
 };
-console.log('uni.getSystemInfoSync()',uni.getSystemInfoSync())
+// console.log('uni.getSystemInfoSync()',uni.getSystemInfoSync())
 switch (uni.getSystemInfoSync().platform) {
 	case 'android':
         Vue.prototype.$isIos = false

+ 35 - 5
Source/merchant-app/pages.json

@@ -11,22 +11,40 @@
 		        "enablePullDownRefresh": false
 		    }
 		}
+        ,{
+            "path" : "pages/login/loginCode",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
 		,{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "物业"
 			}
 		}
-	    ,{
-            "path" : "pages/main/main",
+        ,{
+            "path" : "pages/order/order",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
+            
         }
         ,{
-            "path" : "pages/login/loginCode",
+            "path" : "pages/data/data",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+        }
+        ,{
+            "path" : "pages/mine/mine",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
@@ -55,10 +73,22 @@
                 "selectedIconPath": "static/tab/index-H.png",
                 "text": "首页"
             },
+			{
+			    "pagePath": "pages/order/order",
+			    "iconPath": "static/tab/order.png",
+			    "selectedIconPath": "static/tab/order.png",
+			    "text": "订单"
+			},
+			{
+			    "pagePath": "pages/data/data",
+			    "iconPath": "static/tab/data.png",
+			    "selectedIconPath": "static/tab/data.png",
+			    "text": "数据"
+			},
             {
-                "pagePath": "pages/main/main",
+                "pagePath": "pages/mine/mine",
                 "iconPath": "static/tab/mine.png",
-                "selectedIconPath": "static/tab/mine-H.png",
+                "selectedIconPath": "static/tab/mine.png",
                 "text": "我的"
             }
         ]

+ 8 - 3
Source/merchant-app/pages/main/main.vue → Source/merchant-app/pages/data/data.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="content">
 		 
-		<view class="">
-			
-		</view>
+		<cu-custom bgColor="bg-white" :isBack="false">
+		    <block slot="backText"></block>
+		    <block slot="content">
+				<view class="text-lg" >
+					数据
+				</view>
+			</block>
+		</cu-custom>
 	</view>
 </template>
 

+ 10 - 10
Source/merchant-app/pages/index/index.vue

@@ -11,6 +11,7 @@
 		<view class="text-main flex justify-center">
 			hahah
 			<u-icon name="photo"></u-icon>
+            <button @tap="createView()">创建View对象</button>
 		</view>
        
 	</view>
@@ -35,16 +36,15 @@
         onShow() {
         },
 		methods: {
-            abc() {
-               this.actionSheetShow = true;
-            },
-            chooseVideoSuccess(obj) {
-                console.log(obj)
-                this.list.push(obj)
-            },
-            cancelVideoClick() {
-                this.actionSheetShow = false;
-            },
+            createView() {
+                view = new plus.nativeObj.View('test',
+                {top:'0px',left:'0px',height:'44px',width:'100%'},
+                [{tag:'img',id:'img',src:'nbg.png',position:{top:'0px',left:'0px',width:'100%',height:'100%'}},
+                {tag:'rect',id:'rect',color:'#FF0000',position:{top:'0px',left:'0px',width:'100%',height:'1px'}},
+                {tag:'font',id:'font',text:'原生控件',textStyles:{size:'18px'}}
+                ]);
+                view.show();
+            }
 		}
 	}
 </script>

+ 7 - 2
Source/merchant-app/pages/login/login.vue

@@ -8,7 +8,7 @@
             <view class="mine-top">
                 <view class="color-4E5969 font-48 font-weight5 text-center">181****0048</view>
                 <view class="font-sm color-C9CDD4 margin-top10 text-center">中国联通提供认证服务</view>
-                <view class="btn-main-xl margin-top64">本机号码一键登录</view>
+                <view class="btn-main-xl margin-top64" @tap="login">本机号码一键登录</view>
                 <view class="btn-xl margin-top32" @tap="toCode">使用其他手机号登录</view>
                 <view class="flex margin-top32">
                     <view class="select border-radius margin-top8" style="border: 2rpx solid #E5E6EB;" v-if="!choosed" @tap="choosed=!choosed"></view>
@@ -46,7 +46,12 @@
                 uni.navigateTo({
                     url:"/pages/login/loginCode"
                 })
-            }
+            },
+			login() {
+				uni.switchTab({
+				  url: '../index/index'
+				});
+			}
 		}
 	}
 </script>

+ 24 - 21
Source/merchant-app/pages/login/loginCode.vue

@@ -27,7 +27,7 @@
                     </view>
 
                 </u-form>
-                <view class="btn-main-xl margin-top46">注册登录</view>
+                <view class="btn-main-xl margin-top46" @tap="submit">注册登录</view>
                 <view class="flex margin-top32">
                     <view class="select border-radius margin-top8" style="border: 2rpx solid #E5E6EB;" v-if="!choosed" @tap="choosed=!choosed"></view>
                     <image :src="$ossUrl('icon/select-selected.png')" class="select margin-top8" v-if="choosed" @tap="choosed=!choosed"></image>
@@ -65,26 +65,29 @@
 		},
 		methods: {
 			submit() {
-				// console.log(this.form);
-				if (!this.$u.test.mobile(String(this.form.phone))) {
-					this.$api.msg("手机号格式不正确!")
-				} else if (!this.$u.test.code(this.form.code, 6)) {
-					this.$api.msg("验证码格式不正确!")
-				} else {
-					this.$u.api.smsLogin(this.form).then(res => {
-						// console.log(res)
-						if (res.code === 200) {
-							//登录成功,跳转首页
-							uni.setStorageSync("userInfo", res.data)
-							uni.setStorageSync("token", res.data.token)
-							uni.switchTab({
-							  url: '../index/index'
-							});
-						} else {
-							this.$api.msg(res.msg);
-						}
-					})
-				}
+				uni.switchTab({
+				  url: '../index/index'
+				});
+				// // console.log(this.form);
+				// if (!this.$u.test.mobile(String(this.form.phone))) {
+				// 	this.$api.msg("手机号格式不正确!")
+				// } else if (!this.$u.test.code(this.form.code, 6)) {
+				// 	this.$api.msg("验证码格式不正确!")
+				// } else {
+				// 	this.$u.api.smsLogin(this.form).then(res => {
+				// 		// console.log(res)
+				// 		if (res.code === 200) {
+				// 			//登录成功,跳转首页
+				// 			uni.setStorageSync("userInfo", res.data)
+				// 			uni.setStorageSync("token", res.data.token)
+				// 			uni.switchTab({
+				// 			  url: '../index/index'
+				// 			});
+				// 		} else {
+				// 			this.$api.msg(res.msg);
+				// 		}
+				// 	})
+				// }
 
 			},
 

+ 30 - 0
Source/merchant-app/pages/mine/mine.vue

@@ -0,0 +1,30 @@
+<template>
+	<view>
+		<cu-custom bgColor="bg-white" :isBack="false">
+		    <block slot="backText"></block>
+		    <block slot="content">
+				<view class="text-lg" >
+					我的
+				</view>
+			</block>
+		</cu-custom>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

+ 30 - 0
Source/merchant-app/pages/order/order.vue

@@ -0,0 +1,30 @@
+<template>
+	<view>
+		<cu-custom bgColor="bg-white" :isBack="false">
+		    <block slot="backText"></block>
+		    <block slot="content">
+				<view class="text-lg" >
+					订单
+				</view>
+			</block>
+		</cu-custom>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

BIN
Source/merchant-app/static/tab/data.png


BIN
Source/merchant-app/static/tab/index-H.png


BIN
Source/merchant-app/static/tab/index.png


BIN
Source/merchant-app/static/tab/mine-H.png


BIN
Source/merchant-app/static/tab/mine.png


BIN
Source/merchant-app/static/tab/order.png


+ 2 - 2
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/login/login","pages/index/index","pages/main/main","pages/login/loginCode"],"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}},{"path":"/pages/login/loginCode","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/login/login","pages/login/loginCode","pages/index/index","pages/order/order","pages/data/data","pages/mine/mine"],"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/order/order","iconPath":"static/tab/order.png","selectedIconPath":"static/tab/order.png","text":"订单"},{"pagePath":"pages/data/data","iconPath":"static/tab/data.png","selectedIconPath":"static/tab/data.png","text":"数据"},{"pagePath":"pages/mine/mine","iconPath":"static/tab/mine.png","selectedIconPath":"static/tab/mine.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/login/loginCode","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"物业"}},{"path":"/pages/order/order","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/data/data","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/mine/mine","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}}}});

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
Source/merchant-app/unpackage/dist/dev/app-plus/app-service.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 62 - 258
Source/merchant-app/unpackage/dist/dev/app-plus/app-view.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
Source/merchant-app/unpackage/dist/dev/app-plus/manifest.json


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/data.png


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/index-H.png


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/index.png


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/mine-H.png


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/mine.png


BIN
Source/merchant-app/unpackage/dist/dev/app-plus/static/tab/order.png


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio