update two login style

.gitignore

@@ -1,2 +1,3 @@
 .vscode
 node_modules
+unpackage

App.vue

@@ -1,18 +1,18 @@
 <script>
 export default {
 	onLaunch: function() {
-			console.log('App Launch')
+		console.log('App Launch');
 	},
 	onShow: function() {
-			console.log('App Show')
+		console.log('App Show');
 	},
 	onHide: function() {
-			console.log('App Hide')
+		console.log('App Hide');
-		}
 	}
+};
 </script>
 
 <style lang="scss">
 /*每个页面公共css */
-	@import "uview-ui/index.scss";
+@import 'uview-ui/index.scss';
 </style>

common/http.api.js

@@ -8,7 +8,7 @@ const install = (Vue, vm) => {
             return vm.$u.get("Streaming/getLiveSpec")
         },
         login({member_name,member_password}){
-            return vm.$u.post("Login/login",{member_name,member_password})
+            return vm.$u.get("/Login/expertLogin",{member_name,member_password})
         },
         createLivesp({spec_name}){
             return vm.$u.post("Streaming/createLivesp",{spec_name})
@@ -21,7 +21,19 @@ const install = (Vue, vm) => {
         },
         liveStreamList(){
             return vm.$u.post("Streaming/liveStreamList")
-        }
+        },
+		// 获取订单列表
+		getorderlist(){
+			return vm.$u.get("/Order/orderList")
+		},
+		// 获取轮播图列表
+		getswiper(){
+			return vm.$u.get("/Order/orderList")
+		},
+		// 商家登陆
+		shoplogin(obj){
+		    return vm.$u.get("/Login/storeLogin",obj)
+		},
     }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = api;

common/http.interceptor.js

@@ -1,7 +1,7 @@
 const install = (Vue, vm) => {
 	// 此为自定义配置参数，具体参数见上方说明
 	Vue.prototype.$u.http.setConfig({
-        baseUrl: 'https://dmmall.sdbairui.com//storeapi',
+        baseUrl: 'https://dmmall.sdbairui.com/storeapi',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
 		// 设置自定义头部content-type

package-lock.json

@@ -6,13 +6,8 @@
   "dependencies": {
     "uview-ui": {
       "version": "1.5.2",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
       "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
-=======
-      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
-      "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
->>>>>>> fa383397b331ec0091096becf886f978cc1277fc
     }
   }
 }

pages/index/index.vue

@@ -1,31 +1,35 @@
 <template>
 	<view class="home">
-		<view class="image-swiper">
+		<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
-			<u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper>
-		</view>
 		<view class="tab-swiper">
-			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="26" height="98" :show-bar="false" swiperWidth="750" gutter="52"></u-tabs-swiper>
+			<u-tabs-swiper
+				ref="uTabs"
+				:list="list"
+				:current="current"
+				@change="tabsChange"
+				active-color="#FF780F"
+				inactive-color="#333333"
+				font-size="26"
+				height="98"
+				:show-bar="false"
+				swiperWidth="750"
+				gutter="52"
+			></u-tabs-swiper>
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
-					<view v-for="(item, index) in 5" :key="index">
+					<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
-						<OrderItem :cur="current"></OrderItem>
-					</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
+					<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
-						<OrderItem :cur="current"></OrderItem>
-					</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
+					<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
-						<OrderItem :cur="current"></OrderItem>
-					</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
@@ -34,7 +38,7 @@
 						<view class="select-container">
 							<view class="title">选择骑手</view>
 							<view class="worker" v-if="JSON.stringify(worker) != '{}'">
-								<view>{{ worker.company + " " + worker.name }}</view>
+								<view>{{ worker.company + ' ' + worker.name }}</view>
 								<u-icon name="edit-pen" @click="worker = {}"></u-icon>
 							</view>
 							<view v-else class="select" @click="showSelect = true">
@@ -53,22 +57,18 @@
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index">
+					<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
-						<OrderItem :cur="current"></OrderItem>
-					</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 15" :key="index">
+					<view v-for="(item, index) in 15" :key="index"><OrderItem :cur="current"></OrderItem></view>
-						<OrderItem :cur="current"></OrderItem>
-					</view>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
 		<view class="release-btn" @click="publish">
-			<image src="/static/home/1.png"></image>
+			<image src="../../static/image/index/publish.png"></image>
-			<view class="text" @click="release()">发布</view>
+			<view class="text">发布</view>
 		</view>
 		<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
 		<u-popup v-model="showComplaint" mode="center" border-radius="10">
@@ -84,45 +84,50 @@
 			<view class="publish">
 				<view class="list">
 					<view @click="navto('release/tosign')">
-						<image></image>
+						<image src="../../static/image/index/live.png"></image>
 						<text>直播</text>
 					</view>
 					<view @click="navto('release/index')">
-						<image></image>
+						<image src="../../static/image/index/photo.png"></image>
 						<text>图文</text>
 					</view>
 					<view @click="navto('release/video')">
-						<image></image>
+						<image src="../../static/image/index/video.png"></image>
 						<text>视频</text>
 					</view>
 				</view>
-				<image class="off"></image>
+				<image src="../../static/image/index/close.png" class="off" @click="close"></image>
 			</view>
 		</u-popup>
 	</view>
 </template>
 
 <script>
-import OrderItem from '@/components/order-item/index'
+import OrderItem from '@/components/order-item/index';
 export default {
 	data() {
 		return {
-			list: [{
+			list: [
+				{
 					name: '全部订单'
-			}, {
+				},
+				{
 					name: '试穿订单'
-			}, {
+				},
+				{
 					name: '待处理订单'
-			}, {
+				},
+				{
 					name: '投诉骑手'
-			}, {
+				},
+				{
 					name: '已完成订单'
-			}, {
+				},
+				{
 					name: '退货订单'
-			}],
+				}
-			imageList: [
-				{}, {}, {}
 			],
+			imageList: [],
 			showSelect: false,
 			current: 0,
 			swiperCurrent: 0,
@@ -157,28 +162,75 @@ export default {
 					]
 				}
 			],
-			publishstate:true
+			publishstate: false,
-		}
+			num: 0
+		};
 	},
 	components: {
 		OrderItem
 	},
 	onLoad() {
-
+		this.getswiper();
+		this.getallorder();
+		this.getorderlist();
 	},
 	methods: {
-		release(){
+		// 关闭发布弹窗
-			this.publishstate = true
+		close() {
+			this.publishstate = false;
 		},
+		// 获取订单列表
+		getorderlist(type) {
+			let that = this;
+			this.$u.api
+				.getorderlist({
+					page: that.num,
+					state_type: type
+				})
+				.then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+					} else {
+					}
+				});
+		},
+		// 获取全部订单
+		getallorder() {
+			let that = this;
+			this.$u.api
+				.getorderlist({
+					page: that.num
+				})
+				.then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+					} else {
+					}
+				});
+		},
+		// 获取轮播图
+		getswiper() {
+			this.imageList =[{
+						image: '../../static/image/index/swiper.png'
+					},
+					{
+						image: '../../static/image/index/swiper.png'
+					},
+					{
+						image: '../../static/image/index/swiper.png'
+					}
+				]
+		},
+		// 打开发布弹窗
 		publish() {
-
+			this.publishstate = true;
 		},
 		setWorker(e) {
 			// console.log(e);
 			this.worker = {
 				company: e[0].label,
 				name: e[1].label
-			}
+			};
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
@@ -192,19 +244,19 @@ export default {
 		navto(url) {
 			this.$u.route({
 				url: `/pages/${url}`
-			})
+			});
 			// console.log(`/pages/${url}`)
 			// uni.navigateTo({
 			// 	url: `/pages/${url}`
 			// });
 		}
 	}
-}
+};
 </script>
 <style lang="scss" scoped>
 .home {
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	display: flex;
 	flex-direction: column;
 	// padding-bottom: 100rpx;
@@ -346,7 +398,6 @@ export default {
 		align-items: center;
 		padding: 50rpx 84rpx 31rpx 78rpx;
 		image {
-			background-color: #0f0;
 		}
 		.list {
 			display: flex;

pages/login/login.vue

@@ -2,22 +2,43 @@
 	<!-- login页面 -->
 	<view>
 		<view class="login">
-			<image class="images" src=""></image>
+			<image class="images" :src="url"></image>
 			<view class="backes"></view>
-			<view class="content">
 			<view class="title_top">德铭阳光在线-商家端</view>
-				<view class="title">账号登录</view>
+			<view class="content">
+				<view class="title">
+					<view v-bind:class="[state==0 ? 'show' : '']" @click="changetab(0)">
+						商家登录
+					</view>
+					<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
+						达人登录
+					</view>
+				</view>
+				<view class="" v-if="state==0">
 					<view class="labales">
-					<image src=""></image>
+						<image src="../../static/image/login/login(3).png"></image>
-					<input v-model="zhanghao" type="tel" placeholder="请输入账号" />
+						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
-					<image src=""></image>
+						<image src="../../static/image/login/login(1).png"></image>
 						<input v-model="mima" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
+				<view class="" v-else>
+					<view class="labales">
+						<image src="../../static/image/login/login(3).png"></image>
+						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
+					</view>
+					<view class="labales">
+						<image src="../../static/image/login/login(1).png"></image>
+						<input v-model="mimaA" type="password" placeholder="请输入密码" />
+					</view>
+				</view>
+
+			</view>
 			<!-- denglu QQ weixin -->
-			<u-button @click="logins">{{login}}</u-button>
+			<button @click="logins">{{ login }}</button> 
+			<!-- <u-button :custom-style="customStyle" ></u-button> -->
 			<u-toast ref="uToast" />
 		</view>
 	</view>
@@ -26,19 +47,28 @@
 export default {
 	data() {
 		return {
-				list: [{
+			list: [
+				{
 					checked: false,
 					disabled: false
-				}],
+				}
+			],
 			value: '',
 			login: '登录',
 			show: false,
-				zhanghao:"",
+			zhanghao: 'seller',
-				mima:""
+			mima: '123456',
-				
+			zhanghaoA: '18953829598 ',
+			mimaA: '123456',
+			url: '',
+			state:0
 		};
 	},
 	methods: {
+		// 改变登陆类型
+		changetab(num){
+			this.state = num
+		},
 		// 选中某个复选框时，由checkbox时触发
 		checkboxChange(e) {
 			//console.log(e);
@@ -48,35 +78,56 @@
 			// console.log(e);
 		},
 		mask_u() {
-				this.show = !this.show
+			this.show = !this.show;
 		},
 		// 获取验证码倒计时
 		getCode() {
-				console.log("11")
+			console.log('11');
-				this.loading()
+			this.loading();
-			},
-			loading(){
-				
 		},
+		loading() {},
 		logins() {
-				this.$u.api.login({member_name:this.zhanghao,member_password:this.mima}).then((res)=>{
+			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
-					console.log(res)
+			uni.clearStorage();
+			// 账号登录1达人0商家
+			if(this.state==1){
+				this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
+					console.log(res);
 					if (res.errCode != 0) {
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
-						})
+						});
 					} else {
-						uni.setStorageSync("token",res.data.token)
+						uni.setStorageSync('token', res.data.token);
-						uni.setStorageSync("userinfo",res.data)
+						uni.setStorageSync('userinfo', res.data);
-						uni.setStorageSync('rongyun',res.data.rongcloud_token)
+						uni.setStorageSync('rongyun', res.data.rongcloud_token);
 						this.$u.route({
-							url:"/pages/index/index",
+							url: '/pages/index/index',
-							type:"switchTab"
+							type: 'switchTab'
-						})
+						});
+					}
+				});
+			}else{
+				this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						uni.setStorageSync('token', res.data.token);
+						uni.setStorageSync('userinfo', res.data);
+						uni.setStorageSync('rongyun', res.data.rongcloud_token);
+						this.$u.route({
+							url: '/pages/index/index',
+							type: 'switchTab'
+						});
+					}
+				});
 			}
 
-				})	
 		}
 	},
 	onLoad() {
@@ -84,17 +135,15 @@
 
 		if (token != undefined && token) {
 			this.$u.route({
-					url:"/pages/index/index"
+				url: '/pages/index/index'
-				})
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
-	
 .login {
-
 	// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
 	.images {
 		position: fixed;
@@ -111,7 +160,6 @@
 		width: 100%;
 		height: 100%;
 		z-index: -1;
-
 	}
 
 	text {
@@ -146,7 +194,18 @@
 	font-weight: bold;
 	margin-bottom: 150rpx;
 	color: #fff;
-		letter-spacing: 3rpx;
+	display: flex;
+	justify-content: flex-start;
+}
+.title view{
+	height: 100rpx;
+	line-height: 100rpx;
+	font-size: 24rpx;
+	padding: 0 20rpx;
+}
+.title .show{
+	font-size: 34rpx;
+	font-weight: bold;
 }
 
 .content {
@@ -198,7 +257,8 @@
 		line-height: 20px;
 	}
 }
-	.uni-input-input, .uni-input-placeholder{
+.uni-input-input,
+.uni-input-placeholder {
 	color: #fff !important;
 	letter-spacing: 2rpx;
 }
@@ -279,7 +339,6 @@
 			width: 45rpx;
 			height: 53rpx;
 			display: inline-block;
-			
 		}
 		flex: 1;
 		margin-top: 77rpx;
@@ -302,10 +361,10 @@
 		color: #666;
 		font-size: 24rpx;
 		margin-top: 30rpx;
-			
 	}
 }
-	.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
+.rect_view:nth-child(1) image,
+.rect_view:nth-child(1) view {
 	float: right;
 }
 .rect_view:nth-child(1) image {
@@ -320,7 +379,8 @@
 	bottom: 0;
 	right: 0;
 }
-	.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
+.rect_view:nth-child(2) image,
+.rect_view:nth-child(2) view {
 	float: left;
 }
 .rect_view:nth-child(2) image {
@@ -336,7 +396,7 @@
 }
 .title_top {
 	position: fixed;
-			top: 36rpx;
+	top: calc(var(--status-bar-height) + 18px);
 	left: 0;
 	right: 0;
 	margin: auto;
@@ -351,4 +411,16 @@
 	background: none;
 	letter-spacing: 4rpx;
 }
+button{
+	width: 670rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	border-radius: 50rpx;
+	height: 100rpx;
+	padding: 0 40rpx;
+	background-color: #ff780f;
+	color: #FFFFFF;
+}
 </style>