Merge remote-tracking branch 'origin/master'

src/common/http.interceptor.js

@@ -16,11 +16,11 @@ const install = (Vue, vm) => {
 	
 	function toLoginPage(){
 		const app = getApp()
-		let jumpLoginStatus = app && app.globalData && app.globalData.jumpLoginStatus
-		if(!jumpLoginStatus){
-			return
+		let curpath = vm.$Route.path
+		if(curpath == '/pages/login/index') {
+			// 如果已经在登录页，无需再次跳转
+			return false
 		}
-		app.globalData.jumpLoginStatus = false
 		vm.$u.route('/pages/login/index');	
 	}
 	Vue.prototype.$u.http.setConfig({

src/components/createCom/XhFiles.vue

@@ -72,7 +72,13 @@
 			}
 		},
 		methods: {
-			selectUpload(){
+			selectUpload(){
+				if (this.imgList.length === 10) {
+					return this.$refs.uToast.show({
+						title: '图片已超出最大数量',
+						type: 'error',
+					})
+				}
 				// 弹窗展示
 				this.maskShow = true
 			},

src/components/photo/preview.vue

@@ -125,7 +125,7 @@
 				photo.currentItemLength = 10
 				this.continuePhoto()
 				// 完成本项
-				this.$emit('finish')
+				//this.$emit('finish')
 			},
 			// 确认图片
 			continuePhoto() {
@@ -139,7 +139,7 @@
 			},
 			submitFile() {
 				const photo = getApp().globalData.photo
-				photo.currentItemLength = photo.currentItemLength + 1
+				if (photo.currentItemLength < 10) photo.currentItemLength = photo.currentItemLength + 1
 				uni.hideLoading()
 				// 当前项的图片显示
 				// 拍照项张数目增加 等于10张

src/components/w-navbar/w-navbar.vue

+<template>
+	<u-navbar
+		:height="40"
+		:background="background"
+		:back-icon-color="navbarColor"
+		:title="title"
+		:titleColor="navbarColor"
+		:is-back="isBack"
+		:is-fixed="isFixed"
+		:title-bold="true"
+		:border-bottom="false">
+	</u-navbar>
+</template>
+
+<script>
+	/**
+	 * navbar 自定义导航栏
+	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
+	 * @tutorial https://www.uviewui.com/components/navbar.html
+	 * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认40）
+	 * @property {String} navbar-Color 导航栏内容的颜色（默认#333333）
+	 * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
+	 * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
+	 * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
+	 * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
+	 * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
+	 * @example <w-navbar title="剑未配妥，出门已是江湖"></w-navbar>
+	 */
+	export default {
+		name:"w-navbar",
+		props: {
+			height: {
+				type: String,
+				default: "40"
+			},
+			background: {
+				type: Object,
+				default(){
+					return {
+						backgroundColor: 'none'
+					}
+				}
+			},
+			navbarColor: {
+				type: String,
+				default: "#333333"
+			},
+			title: {
+				type: String,
+				default: ""
+			},
+			titleBold: {
+				type: Boolean,
+				default: true
+			},
+			isBack: {
+				type: Boolean,
+				default: true
+			},
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+		},
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

src/pages.json

@@ -137,7 +137,26 @@
 		},
 		{
 			"root": "pages/mine",
-			"pages": []
+			"pages": [
+				{
+					"path": "address/index",
+					"style": {
+						"navigationBarTitleText": "收获地址",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "address/addSite",
+					"style": {
+						"navigationBarTitleText": "修改地址",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"disableScroll": true
+					}
+				}
+			]
 		},
 		{
 			"root": "pages/order",
@@ -323,7 +342,7 @@
 	"preloadRule": {
 		"pages/index/index": {
 			"network": "all",
-			"packages": ["pages/order", "pages/learn"]
+			"packages": ["pages/order", "pages/learn", "pages/mine"]
 		}
 	},
 	"globalStyle": {

src/pages/index/index.vue

@@ -108,7 +108,6 @@
 		watch: {
 			vuex_token(val, oldVal) {
 				// 监听token变化，如果更新则重新加载页面数据
-				console.log('', val, oldVal)
 				val && this.initSettleInfo()
 			}
 		},

src/pages/index/mine.vue

@@ -3,15 +3,18 @@
 		<image class="header-image" mode="widthFix" :src="imageUrl + 'wodebeijing.png'"></image>
 		<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
 			<text class="title-view">我的</text>
-		</u-navbar>
-		<view v-if="!takeStatus" class="mine-content">
-			<view class="u-flex header-view">
-				<view class="u-m-r-10">
-					<u-avatar :src="pic" size="140"></u-avatar>
+		</u-navbar>
+		<view class="mine-content">
+			<view class="header-view">
+				<view class="head-image">
+					<u-avatar :src="headImageUrl" size="142" mode="circle"></u-avatar>
 				</view>
-				<view class="u-flex-1">
-					<view class="u-font-18 u-p-b-20">uView ui</view>
-					<view class="u-font-14 u-tips-color">微信号:helang_uView</view>
+				<view class="header-content">
+					<view class="name-view">{{name}}</view>
+					<view :class="['tel-view', {'active': info.tel}]">
+						<text>{{tel}}</text>
+						<icon name="arrow-left-fill"></icon>
+						</view>
 				</view>
 			</view>
 
@@ -45,7 +48,8 @@
 		},
 		data() {
 			return {
-				serviceTel: '0755-81773817',
+				serviceTel: '0755-81773817',
+				info: {},
 				pic: 'https://uviewui.com/common/logo.png',
 				show: true,
 				takeStatus: false,
@@ -108,18 +112,35 @@
 						imageStyle: 'width:32rpx;height:32rpx'
 					}
 				]
+			},
+			name() {
+				return this.info.name || '点击登录'
+			},
+			tel() {
+				return this.info.tel ? '已绑定手机号' : '绑定手机号'
 			},
-			imageUrl(name) {
+			imageUrl() {
 				return process.uniEnv.qn_base_url
 			},
 			pages() {
-				return []
+				return ['', '', '', '', 'address', '', '']
+			},
+			headImageUrl() {
+				return this.info.headImage || this.placeholderImage
+			},
+			placeholderImage() {
+				return this.imageUrl + 'touxiang.png'
 			}
 		},
 		onLoad() {
 
 		},
-		methods: {
+		methods: {
+			handleClick(index) {
+				uni.navigateTo({
+					url: 'pages/mine/' + this.pages[index]
+				})
+			},
 			take() {
 				uni.hideTabBar()
 				this.takeStatus = true
@@ -127,56 +148,82 @@
 			closeTake(img) {
 				console.log(img)
 				this.takeStatus = false
-			},
-			handleClick(index) {
-				uni.navigateTo({
-					url: 'pages/mine/' + this.pages[index]
-				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.mine-view {
+	.mine-view {
 		position: relative;
+		
 		.header-image {
 			position: absolute;
 			width: 100%;
 		}
+		
+		
 		.title-view {
 			color: #FFFFFF;
 			font-weight: bold;
 			font-size: 40rpx;
-		}
-		.mine-content {
-			background-color: #F4F5F7;
-			.header-view {}
-			
-			.list-view {
-				background-color: #FFFFFF;
-				border-radius: 16rpx 16rpx 0 0;
-			
-				.item-title {
-					font-size: 32rpx;
-					color: #333333;
-					margin-left: 16rpx;
-					line-height: 32rpx;
-				}
-			
-				.item-value {
-					font-size: 26rpx;
-					color: #999999;
+			padding-left: 30rpx;
+		}
+		.mine-content {
+			background-color: #F4F5F7;
+
+			.header-view {
+				padding: 30rpx;
+				display: flex;
+				
+				.head-image {
+					width: 142rpx;
+					height: 142rpx;
 				}
-			
-				.line-view {
-					height: 2rpx;
-					background-color: #F4F5F7;
-					margin-top: 30rpx;
-					margin-bottom: 30rpx;
+				.header-content {
+					color: #FFFFFF;
+					z-index: 0;
+					.name-view {
+						
+					}
+					.tel-view {
+						background-color: #FFFFFF;
+						border-radius: 26rpx;
+						color: #2272FF;
+						width: 164rpx;
+						height: 52rpx;
+						&.active {
+							color: #FFFFFF;
+							border: 1rpx bold #FFFFFF;
+						}
+					}
 				}
-			}
+			}
+
+			.list-view {
+				background-color: #FFFFFF;
+				border-radius: 16rpx 16rpx 0 0;
+
+				.item-title {
+					font-size: 32rpx;
+					color: #333333;
+					margin-left: 16rpx;
+					line-height: 32rpx;
+				}
+
+				.item-value {
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				.line-view {
+					height: 2rpx;
+					background-color: #F4F5F7;
+					margin-top: 30rpx;
+					margin-bottom: 30rpx;
+				}
+			}
 		}
-		
+
 	}
 </style>

src/pages/login/index.vue

@@ -113,9 +113,6 @@ export default {
 
 		signupLogin(e) {
 			var that = this
-			console.log(e.detail.errMsg)
-			console.log(e.detail.iv)
-			console.log(e.detail.encryptedData)
 			if (!e || !e.detail || e.detail.errMsg.indexOf('user deny') > -1) {
 				wx.showModal({
 					title: '提示',
@@ -157,22 +154,17 @@ export default {
 
 		goBackPage() {
 			let pages = getCurrentPages();
+			debugger
 			if(pages.length) {
 				let index = pages.length - 1;
 				if(index) {
 					let prevPage = pages[index]; //上一个页面
-					if(prevPage.route == "pages/login/index") {
-						uni.redirectTo({
-							url:'pages/index/index'
-						})
-					} else {
-						if (prevPage && prevPage.$vm) {
-							prevPage.$vm.isRefresh = true;
-						}
-						uni.navigateBack({
-							delta: 1
-						})
+					if (prevPage && prevPage.$vm) {
+						prevPage.$vm.isRefresh = true;
 					}
+					uni.navigateBack({
+						delta: 1
+					})
 				} else {
 					uni.redirectTo({
 						url:'pages/index/index'

src/pages/mine/address/index.vue

 <template>
-	<view>
-		<view class="item" v-for="(res, index) in siteList" :key="res.id">
+	<view class="address-wrap">
+		<w-navbar title="收货地址"></w-navbar>
+		<view class="item" v-for="(res, sindex) in siteList" :key="res.id">
 			<view class="top">
 				<view class="name">{{ res.name }}</view>
 				<view class="phone">{{ res.phone }}</view>
-				<view class="tag">
-					<text v-for="(item, index) in res.tag" :key="index" :class="{red:item.tagText=='默认'}">{{ item.tagText }}</text>
-				</view>
 			</view>
 			<view class="bottom">
-				广东省深圳市宝安区 自由路66号
-				<u-icon name="edit-pen" :size="40" color="#999999"></u-icon>
+				<view class="address">广东省深圳市宝安区宝城67区留芳路6号庭威产业园3栋10C</view>
+				<u-icon :name="editPen" :size="32" color="#999999"></u-icon>
+			</view>
+			<view class="default" v-show="true">
+				<u-icon name="checkmark-circle" color="#2272FF" size="32"></u-icon>
+				<text class="txt">默认地址</text>
 			</view>
 		</view>
 		<view class="addSite" @tap="toAddSite">
@@ -25,12 +27,20 @@
 export default {
 	data() {
 		return {
+			background: {
+				backgroundColor: 'none'
+			},
 			siteList: []
 		};
 	},
 	onLoad() {
 		this.getData();
 	},
+	computed: {
+		editPen() {
+			return process.uniEnv.qn_base_url + 'icon/edit-pen.png'
+		}
+	},
 	methods: {
 		getData() {
 			this.siteList = [
@@ -46,7 +56,7 @@ export default {
 							tagText: '家'
 						}
 					],
-					site: '广东省深圳市宝安区 自由路66号'
+					site: '广东省深圳市宝安区宝城67区留芳路6号庭威产业园3栋10C'
 				},
 				{
 					id: 2,
@@ -70,7 +80,7 @@ export default {
 		},
 		toAddSite(){
 			uni.navigateTo({
-			    url: '/pages/template/address/addSite'
+			    url: '/pages/mine/address/addSite'
 			});
 		}
 	}
@@ -78,42 +88,51 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.address-wrap {
+	background-color: #F4F5F7;
+}
 .item {
-	padding: 40rpx 20rpx;
+	margin: 30rpx;
+	padding: 50rpx 30rpx 48rpx 30rpx;
+	background-color: #FFFFFF;
+	border-radius: 12px;
 	.top {
 		display: flex;
+		font-size: 32rpx;
 		font-weight: bold;
-		font-size: 34rpx;
+		color: #333333;
+		line-height: 32rpx;
 		.phone {
-			margin-left: 60rpx;
-		}
-		.tag {
-			display: flex;
-			font-weight: normal;
-			align-items: center;
-			text {
-				display: block;
-				width: 60rpx;
-				height: 34rpx;
-				line-height: 34rpx;
-				color: #ffffff;
-				font-size: 20rpx;
-				border-radius: 6rpx;
-				text-align: center;
-				margin-left: 30rpx;
-				background-color:rgb(49, 145, 253);
-			}
-			.red{
-				background-color:red
-			}
+			margin-left: 20rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #666666;
 		}
 	}
 	.bottom {
 		display: flex;
-		margin-top: 20rpx;
-		font-size: 28rpx;
+		margin-top: 24rpx;
 		justify-content: space-between;
-		color: #999999;
+		align-items: flex-start;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #333333;
+		.address{
+			max-width: 500rpx;
+			line-height: 40rpx;
+		}
+	}
+	.default {
+		border-top: 2rpx solid #F4F5F7;
+		margin-top: 22rpx;
+		padding-top: 30rpx;
+		.txt {
+			margin-left: 12rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
+			line-height: 28rpx;
+		}
 	}
 }
 .addSite {

src/pages/order/complete.vue

@@ -256,7 +256,8 @@
 			},
 			saveComplete(){// 保存完工信息
 				let self = this
-				let param = {}
+				let param = {}
+				
 				self.list.forEach((panel)=>{
 					param[panel.panelFieldsName] = []
 					panel.items.forEach((group) =>{
@@ -272,15 +273,8 @@
 						})
 					})
 				})
-				
-				if (!param.base[0].fieldsValue) {
-					return this.$refs.uToast.show({
-						title: '请先选择产品规格',
-						type: 'error',
-					})
-				}
 				
-				self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{
+				self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{
 					if (res.code == 200) {
 						this.$refs.uToast.show({
 							title: '保存成功',
@@ -288,7 +282,7 @@
 						})
 					} else {
 					    this.$refs.uToast.show({
-					    	title: res.message,
+					    	title: res.data,
 					    	type: 'error',
 					    })
 					}

src/store/index.js

@@ -33,7 +33,9 @@ const store = new Vuex.Store({
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
 		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
 		vuex_version: '1.0.1',
-		vuex_config: {},	
+		vuex_config: {},
+		// 入驻信息
+		vuex_settled: {},
 		vuex_wx_uid: lifeData.vuex_wx_uid || 0,
 	},
 	mutations: {