调整分享，创建资料等bug

apis/interfaces/order.js

@@ -134,6 +134,14 @@ const getSchemes = id => {
 	})
 }
 
+// 退款单列表
+const refunds = data => {
+	return request({
+		url: 'app/refunds',
+		data
+	})
+}
+
 // 支付订单
 export {
 	lists,
@@ -151,5 +159,6 @@ export {
 	ordersEditorders,
 	orderSign,
 	getOrderSignStatus,
-	getSchemes
+	getSchemes,
+	refunds
 }

apis/interfaces/user.js

@@ -100,6 +100,16 @@ const userInfoBank = id => {
 	})
 }
 
+// 获取省市区
+const getRegion = id => {
+	return request({
+		url		: 'region',
+		data	: {
+			parent_id: id || ''
+		}
+	})
+}
+
 export {
 	relations,
 	code,
@@ -112,5 +122,6 @@ export {
 	eSigns,
 	userInfoBase,
 	userInfoBanks,
-	userInfoBank
+	userInfoBank,
+	getRegion
 }

manifest.json

@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -24,7 +24,8 @@
         /* 模块配置 */
         "modules" : {
             "Barcode" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -56,7 +57,13 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx9ca2a763085ab4b6",
+                        "UniversalLinks" : ""
+                    }
+                }
             },
             "icons" : {
                 "android" : {

pages/account/cash.vue

@@ -88,13 +88,14 @@
 			// 获取列表
 			getLog(){
 				cash({
-					day : this.type,
+					day : this.dayType,
-					type: this.dayType,
+					type: this.type,
 					page: this.page.current
 				}).then(res => {
 					let { total, lists } = res;
 					let atList   = lists.page.current == 1 ? [] : this.list
 					this.list = atList.concat(lists.data)
+					this.total = total
 					this.page = lists.page
 					this.pagesShow = false
 				}).catch(err => {

pages/college/answer.vue

@@ -101,7 +101,7 @@
 				<u-icon class="footer-icon" name="order" size="48rpx" color="#111"></u-icon>
 				<view>答题卡</view>
 			</view>
-			<button class="footer-next" :disabled="answerArr[questionsIndex].option_ids == ''" @click="answerNext">{{(this.questionsIndex + 1) == this.questions.length ? '提交': '下一题'}}</button>
+			<button class="footer-next" :disabled="answerArr[questionsIndex].option_ids == '' || !isShowAnswer" @click="answerNext">{{(this.questionsIndex + 1) == this.questions.length ? '提交': '下一题'}}</button>
 		</view>
 	</view>
 </template>

pages/user/certification.vue

@@ -1,7 +1,8 @@
 <template>
-	<view>
+	<view class="content">
 		<block v-if="!eSign">
 			<!-- 上传身份证 -->
+			<view class="identity-from">
 				<view class="identity-title">请拍摄并上传你的身份证照片</view>
 				<view class="identity-flex">
 					<view class="identity-item" @click="updImg('frontCard')">
@@ -17,6 +18,22 @@
 						<view class="text">拍摄反面</view>
 					</view>
 				</view>
+			</view>
+			<view class="identity-from">
+				<!-- 经营省份 -->
+				<view class="identity-inpus" v-if="provinces.length > 0">
+					<label>经营省份</label>
+					<picker class="city-picker" :value="provincesVal" :range="provinces" range-key="name" @change="onPickerChange($event, 'provincesVal')">
+						<view class="city-picker-text">{{provinces[provincesVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
+					</picker>
+				</view>
+				<view class="identity-inpus" v-if="citys.length > 0">
+					<label>经营城市</label>
+					<picker class="city-picker" :value="citysVal" :range="citys" range-key="name" @change="onPickerChange($event, 'citysVal')">
+						<view class="city-picker-text">{{citys[citysVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
+					</picker>
+				</view>
+			</view>
 		</block>
 		<!-- 身份证信息 -->
 		<view class="identity-from" v-if="realData.name != ''">
@@ -33,6 +50,14 @@
 				<input type="idcard" placeholder="-" v-model="realData.organ" disabled>
 			</view>
 		</view>
+		<!-- 经营地址 -->
+		<view class="identity-from" v-if="eSign">
+			<view class="identity-inpus">
+				<label>经营城市</label>
+				<view class="identity-inpus-text">{{province}} {{city}}</view>
+				<!-- <input type="text" placeholder="-" v-model="city" disabled> -->
+			</view>
+		</view>
 		<!-- 按钮 -->
 		<view class="btn" v-if="!eSign">
 			<button size="default" @click="idCard && !isPathChange ? getSignUrl(): realInfo()">{{idCard && !isPathChange ? '人脸认证': '提交身份信息'}}</button>
@@ -41,7 +66,7 @@
 </template>
 
 <script>
-	import { certification, identityOcr, certified, eSigns } from '@/apis/interfaces/user'
+	import { certification, identityOcr, certified, eSigns, getRegion } from '@/apis/interfaces/user'
 	import { uploads } from '@/apis/interfaces/uploading'
 	export default {
 		data() {
@@ -57,7 +82,14 @@
 					organ	: ''
 				}, // 个人信息
 				signUrl		: '',
-				isRefresh	: false
+				isRefresh	: false,
+				province	: '',
+				city		: '',
+				// 省市区选择
+				provinces	: [],
+				provincesVal: 0,
+				citys		: [],
+				citysVal	: 0
 			}
 		},
 		onShow(){
@@ -67,7 +99,16 @@
 			}
 		},
 		created() {
+			getRegion().then(res => {
+				this.provinces = res
+				this.getCity()
 				this.getCertified()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
 		},
 		methods: {
 			// 检查实名结果
@@ -92,6 +133,36 @@
 					})
 				})
 			},
+			// 选择省市
+			onPickerChange(e, key){
+				let index = e.detail.value
+				this[key] = index
+				this.isPathChange = true
+				if(key === 'provincesVal'){
+					this.getCity()
+				}
+			},
+			// 获取城市
+			getCity(id){
+				uni.showLoading({
+					title: '获取城市',
+					mask : true
+				})
+				getRegion(this.provinces[this.provincesVal].id).then(res => {
+					this.citys = res
+					if(id){
+						this.citysVal = this.citys.findIndex(val => val.id === id)
+					}else{
+						this.citysVal = 0
+					}
+					uni.hideLoading()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
 			// 提交真实信息
 			getInfo(){
 				uni.showLoading({
@@ -107,6 +178,14 @@
 						showpath: res.back_card,
 						path	: res.back_card_path
 					}
+					if(res.province.id != 0){
+						this.province = res.province.name
+						this.provincesVal = this.provinces.findIndex(val => val.id === res.province.id)
+					}
+					if(res.city.id != 0){
+						this.getCity(res.city.id)
+						this.city = res.city.name
+					}
 					this.realData = res;
 					uni.hideLoading()
 				}).catch(err => {
@@ -124,12 +203,15 @@
 					mask : true
 				})
 			    certification({
+					province_id: this.provinces[this.provincesVal].id,
+					city_id: this.citys[this.citysVal].id,
 					front_card: this.frontCard.path,
 					back_card : this.backCard.path,
 					redirect_url: 'http://web.douhuofalv.com/app/e-sign?sign_type=personal',
 					app_scheme: 'doufire://'
 				}).then(res => {
 					let certificationData = res;
+					this.idCard	= true
 					this.isPathChange = false
 					this.realData = certificationData.certification
 					this.signUrl  = certificationData.sign.authShortUrl
@@ -180,7 +262,6 @@
 							url: res.authShortUrl
 						}
 					})
-					// plus.runtime.openURL(res.authShortUrl)
 					uni.hideLoading()
 				}).catch(err => {
 					uni.showToast({
@@ -219,7 +300,8 @@
 <style lang="scss" scoped>
 	// 身份信息
 	.identity-from{
-		border-bottom: 30rpx solid #f8f8f8;
+		border-top: 30rpx solid #f8f8f8;
+		background-color: white;
 		.identity-inpus{
 			display: flex;
 			border-bottom: solid 1rpx #F6F6F6;
@@ -240,6 +322,23 @@
 				width: calc(100% - 180rpx);
 				text-align: right;
 			}
+			.identity-inpus-text{
+				font-size: 32rpx;
+				width: calc(100% - 180rpx);
+				text-align: right;
+			}
+			.city-picker{
+				width: calc(100% - 180rpx);
+				.city-picker-text{
+					padding-right: 50rpx;
+					position: relative;
+					text-align: right;
+					.city-icon{
+						position: absolute;
+						right: 0;
+					}
+				}
+			}
 		}
 	}
 	// 身份证上传
@@ -247,11 +346,10 @@
 		padding: 0 30rpx;
 		line-height: 90rpx;
 		font-size: 30rpx;
-		color: #111111;
-		border-top: 30rpx solid #f8f8f8;
 		color: gray;
 	}
 	.identity-flex{
+		background: white;
 		display: flex;
 		padding: 0 20rpx 30rpx;
 		.identity-item{
@@ -282,7 +380,6 @@
 				font-size: 28rpx;
 			}
 		}
-		border-bottom: 30rpx solid #f8f8f8;
 	}
 	// 身份认证按钮
 	.btn{

pages/user/code.vue

@@ -13,12 +13,12 @@
 					<l-painter class="qrcode-src">
 						<l-painter-qrcode
 							:text="'http://web.douhuofalv.com/login/register?invite_code=' + invite"
-							css="width: 260rpx; height: 260rpx; background-color:white; padding: 20rpx; border-radius: 10rpx;"
+							css="width: 130px; height: 130px; background-color:white; padding: 10px;  border-radius: 10rpx;"
 						/>
 					</l-painter>
-					<view class="qrcode-text">邀请码{{invite}}</view>
+					<view class="qrcode-text" @click="copyInvite">邀请码{{invite}}</view>
 				</view>
-				<image class="btn" src="@/static/code/code_btn.png" mode="widthFix"></image>
+				<image class="btn" src="@/static/code/code_btn.png" mode="widthFix" @click="onWx"></image>
 			</view>
 			<image class="footer" src="@/static/code/code_footer.png" mode="widthFix"></image>
 		</view>
@@ -43,6 +43,36 @@
 					icon : 'none'
 				})
 			})
+		},
+		methods: {
+			copyInvite(){
+				uni.setClipboardData({
+					data: this.invite,
+					success() {
+						uni.showToast({
+							title: '邀请码已复制',
+							icon : 'none'
+						})
+					}
+				})
+			},
+			onWx(){
+				uni.share({
+					title	: "抖火法律",
+					provider: "weixin",
+					scene	: "WXSceneSession",
+					imageUrl: require('@/static/logo.png'),
+					href	: "http://web.douhuofalv.com/login/register?invite_code=" + this.invite,
+					type	: 0,
+					summary: "法律问题我们'抖'懂",
+					fail: err => {
+						uni.showToast({
+							title: err.message,
+							icon : 'none'
+						})
+					}
+				});
+			}
 		}
 	}
 </script>
@@ -103,7 +133,7 @@
 			.block {
 				text-align: center;
 				margin-bottom: 30rpx;
-
+				width: 100%;
 				.qrcode {
 					display: inline-block;
 					border: solid 2rpx #ECC997;
@@ -111,14 +141,15 @@
 					border-radius: 20rpx;
 					padding: 30rpx;
 					.qrcode-src{
-						width: 300rpx;
+						width: 150px;
-						height: 300rpx;
+						height: 150px;
 					}
 					.qrcode-text {
 						text-align: center;
 						color: #FFF5C6;
 						line-height: 50rpx;
 						padding-top: 30rpx;
+						font-size: 30rpx;
 					}
 				}
 				.btn {

pages/user/eSign.vue

@@ -19,7 +19,7 @@
 				let { data } = e.detail
 				data.map(val => {
 					if(val.type === 'back'){
-						uni.navigateBack()
+						this.$Route.back()
 						return
 					}
 				})

pages/user/team.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="header">
 			客户列表
-			<text>共{{count.all}}客户</text>
+			<text>共{{count.one}}人</text>
 		</view>
 		<block v-if="users.length > 0">
 			<view class="team-item" v-for="(item, index) in users" :key="index">
@@ -44,6 +44,7 @@
 			relations({
 				larer: 1
 			}).then(res => {
+				console.log(res)
 				let { users, count } = res;
 				this.users = users.data
 				this.count = count

pages/work/refundOrder.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-	import { lists } from '@/apis/interfaces/order.js'
+	import { refunds } from '@/apis/interfaces/order.js'
 	export default {
 		data() {
 			return {
@@ -65,8 +65,8 @@
 		methods:{
 			// 获取列表
 			getList(){
-				lists({
+				refunds({
-					status: 11
+					status: ''
 				}).then(res => {
 					let { data } = res;
 					this.orders = data