Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/photo/preview.vue

@@ -198,7 +198,7 @@
 	}
 
 	.bottomView {
-		box-shadow: 0 0 1rpx 6rpx rgba(255,255,255,0.05);
+		//box-shadow: 0 0 1rpx 6rpx rgba(255,255,255,0.05);
 		background-color: #333333;
 		width: 100%;
 		padding:70rpx 0;

src/pages.json

@@ -178,7 +178,7 @@
 					}
 				},
                 {
-                    "path": "cert/list",
+                    "path": "cert/index",
                     "style": {
                         "navigationBarTitleText": "我的证件",
                         "navigationStyle":"custom"
@@ -190,6 +190,22 @@
                         "navigationBarTitleText": "",//证件详情
                         "navigationStyle":"custom"
                     }
+                },
+				{
+                    "path": "customer/index",
+                    "style": {
+						"navigationStyle":"custom",
+						"navigationBarTitleText": "联系客服",
+						"enablePullDownRefresh": false
+					}
+                },
+				{
+                    "path": "deposit/index",
+                    "style": {
+						"navigationStyle":"custom",
+						"navigationBarTitleText": "配件押金",
+						"enablePullDownRefresh": false
+					}
                 }
             ]
 		},
@@ -421,16 +437,6 @@
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [
-			{
-				"name": "自营平台", //模式名称
-				"path": "pages/index/index", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
-			{
-				"name": "订单列表", //模式名称
-				"path": "pages/index/order", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
 			{
 				"name": "拍照小工具", //模式名称
 				"path": "pages/photo/index", //启动页面，必选
@@ -442,11 +448,6 @@
 				"path": "pages/order/feedback",
 				"query": ""
 			},
-			{
-				"name": "订单详情", //模式名称
-				"path": "pages/order/detail", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
 			{
 				"name": "在线考试", //模式名称
 				"path": "pages/learn/exam", //启动页面，必选
@@ -464,31 +465,6 @@
 					"id":11880091
 				} //启动参数，在页面的onLoad函数里面得到
 			},
-			{
-				"name": "资料信息", //模式名称
-				"path": "pages/settle/file", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
-			{
-				"name": "缴纳保证金", //模式名称
-				"path": "pages/settle/pay-ensure", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
-			{
-				"name": "签约页面", //模式名称
-				"path": "pages/settle/sign-contract", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
-			{
-				"name": "订单 - 拒单", //模式名称
-				"path": "pages/order/refuse", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
-			{
-				"name": "订单 - 过程反馈", //模式名称
-				"path": "pages/order/feedback", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
 			{
 				"name": "学习 - 首页", //模式名称
 				"path": "pages/index/learn", //启动页面，必选
@@ -496,7 +472,7 @@
 			},
             {
                 "name": "我的 - 我的证件 - 列表", //模式名称
-                "path": "pages/mine/cert/list", //启动页面，必选
+                "path": "pages/mine/cert/index", //启动页面，必选
                 "query": "" //启动参数，在页面的onLoad函数里面得到
             }
 		]

src/pages/index/mine.vue

@@ -123,7 +123,7 @@
 				return process.uniEnv.qn_base_url
 			},
 			pages() {
-				return ['wallet', '', 'contract', 'cert', 'address', '', '']
+				return ['wallet', 'deposit', 'contract', 'cert', 'address', '', 'customer']
 			},
 			headImageUrl() {
 				return this.info.headImage || this.placeholderImage

src/pages/mine/cert/list.vue → src/pages/mine/cert/index.vue

 <template>
     <view class="cert-page">
         <u-navbar
+            class="navbarHeigth"
             back-icon-color="#000000"
             :background="background"
             title-color="#000"
@@ -9,9 +10,9 @@
             title-bold="true"
         ></u-navbar>
         <view class="content-cody">
-            <u-cell-group>
+            <u-cell-group :border="false">
                 <u-cell-item v-for="item in list" :title="item.name" :value="item.isUploadName" :arrow="true"
-                 :value-style="{'color': item.color}" @click="toDetail(item.keyName)">
+                 :value-style="{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
                     <u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
                 </u-cell-item>
             </u-cell-group>
@@ -129,16 +130,19 @@
     .cert-page {
         font-size: 28rpx;
         margin: 30rpx;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
     }
     .content-cody {
-        /* padding-left: 30rpx;
-        padding-right: 30rpx; */
-        padding-left: 30rpx;
-        padding-right: 30rpx;
+        padding: 30rpx;
         background-color: #ffffff;
         border-radius: 12rpx;
+        height: 82vh;
     }
     .rightBlue {
         color: #007AFF;
     }
+    
+    
 </style>

src/pages/mine/customer/index.vue

+<template>
+	<view class="cus-wrap">
+		<w-navbar title="联系客服"></w-navbar>
+		<view class="content">
+			<u-image class="qrcode" :src="cusQrcode" width="400" mode="widthFix" @longtap="download">
+				<u-loading slot="loading"></u-loading>
+				<view slot="error" style="font-size: 24rpx;">加载失败</view>
+			</u-image>
+			<text class="desc">长按二维码保存图片添加官方客服微信</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		computed: {
+			cusQrcode() {
+				return process.uniEnv.qn_base_url + 'erweima-bg.png'
+			},
+		},
+		methods: {
+			download() {
+				let that = this;
+				uni.downloadFile({           //获得二维码的临时地址
+					url: that.erweimaImage,
+					success:(res)=>{
+						if(res.statusCode == 200){
+							uni.saveImageToPhotosAlbum({
+								filePath:res.tempFilePath,//传入临时地址
+								success() {
+									that.$u.toast('保存成功!');
+								},
+								fail() {
+									that.$u.toast('保存失败!');
+								}
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.cus-wrap {
+	background-color: #F4F5F7;
+	padding: 30rpx;
+	
+	.content {
+		width: 690rpx;
+		height: 800rpx;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
+		.qrcode {
+			margin-top: 160rpx;
+		}
+		.desc {
+			margin-top: 40rpx;
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #666666;
+			line-height: 24rpx;
+		}
+	}
+}
+
+</style>

src/pages/mine/deposit/index.vue

+<template>
+	<view class="det-wrap">
+		<w-navbar title="配件押金"></w-navbar>
+		<view class="content">
+			<view class="toolbar">
+				<view class="refund" @tap="refund">退押金</view>
+			</view>
+			<view class="deposit">
+				<view class="title">我的配件押金</view>
+				<view class="amount"><text class="prefix">￥</text>{{ amount }}</view>
+			</view>
+			<view class="rules">
+				<view class="title">质保金规则</view>
+				<view class="item" v-for="(item, index) in rules" :key="index">
+					<view class="question">
+						<view class="qa-icon danger-bg">Q</view>
+						<view class="txt">{{ item.question }}</view>
+					</view>
+					<view class="answer">
+						<view class="qa-icon default-bg">A</view>
+						<view class="txt">{{ item.answer }}</view>
+					</view>
+					<u-divider v-show="rules.length != (index+1)" half-width="315" border-color="#F4F5F7" height="20"></u-divider>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				settled: null,
+				rules: [
+					{
+						question: '为什么缴纳设备押金？',
+						answer: `设备押金是什么什么什么，应该巴拉巴拉巴拉，所以
+								要缴纳，巴拉巴拉巴拉。`
+					},
+					{
+						question: '退还设备押金说明',
+						answer: `设备押金的退还说明是什么什么样的，应该怎么怎么
+								样，先找客服，然后再怎么怎么样，然后再怎么怎么
+								样，这样就可以了。`
+					}
+				],
+			};
+		},
+		computed: {
+			amount() {
+				return this.settled && this.settled.deposit || '0.00';
+			},
+		},
+		onLoad() {
+			if(this.vuex_token && this.vuex_settled) {
+				this.settled = this.vuex_settled
+			} else {
+				this.getData();
+			}
+		},
+		methods: {
+			getData() {
+				let self = this
+				const callBack = (vm, result) => {
+					// 后台自动判断入驻流程是否完成，前台通过status确定状态
+					if (result && result.record) {
+						self.settled = result.record
+					}
+				};
+				app.getBaseInfo(self, callBack);
+			},
+			refund() {
+				this.$u.route({
+					type: 'redirect',
+					url: "pages/mine/customer/index"
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.det-wrap {
+	background-color: #F4F5F7;
+	padding: 30rpx;
+	
+	.content {
+		padding: 30rpx;
+		width: 690rpx;
+		min-height: 1120rpx;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
+		.toolbar {
+			align-self: flex-end;
+			.refund {
+				text-align: center;
+				width: 88rpx;
+				height: 40rpx;
+				background: #F4F5F7;
+				border-radius: 26rpx;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #2272FF;
+				line-height: 40rpx;
+			}
+			
+		}
+		.deposit {
+			margin-top: 50rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			.title {
+				font-size: 40rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 40rpx;
+			}
+			.amount {
+				margin-top: 60rpx;
+				font-size: 72rpx;
+				font-weight: bold;
+				color: #2272FF;
+				line-height: 72rpx;
+				.prefix{
+					font-size: 40rpx;
+				}
+			}
+		}
+		.rules {
+			align-self: flex-start;
+			margin-top: 160rpx;
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333333;
+				line-height: 32rpx;
+				margin-bottom: 10rpx;
+			}
+			.item {
+				margin-top: 40rpx;
+				.question {
+					display: flex;
+					margin-bottom: 30rpx;
+					.txt {
+						margin-left: 20rpx;
+						width: 554rpx;
+						font-size: 28rpx;
+						font-weight: bold;
+						color: #333333;
+						line-height:40rpx;
+					}
+				}
+				.answer {
+					display: flex;
+					margin-bottom: 30rpx;
+					.txt {
+						margin-left: 20rpx;
+						width: 554rpx;
+						font-size: 24rpx;
+						font-weight: 400;
+						color: #666666;
+						line-height: 36rpx;
+					}
+				}
+			}
+		}
+	}
+}
+.qa-icon {
+	text-align: center;
+	width: 40rpx;
+	height: 40rpx;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 40rpx;
+}
+.danger-bg {
+	background: #FA5A49;
+}
+.default-bg {
+	background: #2272FF;
+}
+</style>