2020.05.14

apis/fortune.js

@@ -12,4 +12,5 @@ export const _API_FortuneReward = data => request.get('/income/detail', data) //
 
 export const _API_PurseRunning = data => request.get('/user/user_pay_log', data) // 获取钱包流水
 
-export const _API_OrderSum = data => request.get('/user/user_pay_log', data) // 获取订货汇总
+export const _API_OrderSum = data => request.get('/order/order_data', data) // 获取订货汇总
+export const _API_OrderRank = data => request.get('/order/order_rank', data) // 获取订货排行

apis/user.js

@@ -17,3 +17,5 @@ export const _API_Auth_Share = data => request.uploadFile('/user/auth_share', da
 export const _API_Proxy_Updata = data => request.get('/proxy/updata', data) // 获取代理升级情况
 export const _API_Proxy_Upload = data => request.uploadFile('/proxy/upload', data) // 代理升级上传图片
 export const _API_Proxy_UploadUrls = data => request.post('/proxy/updata_urls', data) // 代理升级上传图片 urls
+
+export const _API_Proxy_ChangeName = data => request.post('/user/update_nickname', data) // 代理改名字

pages.json

@@ -210,11 +210,11 @@
         }
         ,{
             "path" : "pages/express-detail/express-detail",
-            "style" : {}
+            "style": { "navigationBarTitleText": "物流详情" }
         }
         ,{
             "path" : "pages/order-sum/order-sum",
-            "style" : {}
+            "style": { "navigationBarTitleText": "订货汇总", "enablePullDownRefresh": true }
         }
     ],
 	"tabBar": {

pages/examine-detail/examine-detail.vue

@@ -105,7 +105,8 @@
 		onLoad(opt) {
 			this.type = +opt.type
 			this.index = opt.index
-			this.info = JSON.parse(opt.data)
+			this.info = JSON.parse(decodeURIComponent(opt.data))
+			console.log(this.info)
 			if (!this.info.id) {
 				uni.navigateBack({delta: 2 })
 				uni.navigateTo({ url: '../register-examine/register-examine' })

pages/index/index.vue

@@ -36,7 +36,10 @@
 					<text>2020年5月11日 22点—2020年5月14日 24点</text>
 					<image class="bg" src="../../static/icon/activebg.png"></image>
 				</view>
-				<view class="count">距活动结束仅剩：{{ countDown }}</view>
+				<view class="count">
+					<text>距活动结束仅剩</text>
+					<text class="count-down">{{ countDown }}</text>
+				</view>
 			</view>
 			<view class="area index-kingkong">
 				<navigator v-for="(item, index) in kingkongList" :url="item.url" :key="index" :class="{ top: index > 3 }">
@@ -328,7 +331,7 @@
 					}
 				}
 				&.active {
-					height: 190rpx;
+					height: 270rpx;
 					background: #FFFFFF;
 					@include flex(column);
 					.title {
@@ -362,9 +365,21 @@
 						}
 					}
 					> .count {
+						width: 100%;
+						height: 120rpx;
 						font-size: 28rpx;
 						font-weight: bold;
-						color: $app-base-color;
+						background: #0E0E0E;
+						padding-left: 30rpx;
+						@include flex(column);
+						align-items: flex-start;
+						box-sizing: border-box;
+						color: #ff0000;
+						font-size: 28rpx;
+						.count-down {
+							color: #FFFFFF;
+							font-size: 54rpx;
+						}
 					}
 				}
 				&.article {

pages/invite-proxy/invite-proxy.vue

@@ -191,7 +191,7 @@
 								this.isREG = false // 隐藏提交
 								uni.toast('该手机号已注册！请直接登陆！') // 提示邀请码发送成功
 							} else { // code 300 表示禁止获取验证码，禁止登陆
-								uni.toast('获取验证码失败')
+								uni.toast(res.message)
 							}
 						})
 					}

pages/order-sum/order-sum.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="order-sum">
+	<view v-if="data" class="order-sum">
 		<view class="data-bar">
 			<view @click="chooseTime(0)"><text>{{ this.date[0] ? this.date[0] : '开始时间' }}</text> <text v-if="!this.date[0]" class="cuIcon-triangledownfill"></text></view>
 			<view @click="chooseTime(1)"><text>{{ this.date[1] ? this.date[1] : '结束时间' }}</text> <text v-if="!this.date[1]" class="cuIcon-triangledownfill"></text></view>
@@ -89,13 +89,15 @@
 				<view>简约版</view>
 				<view>老人版 </view>
 			</view>
-			<view class="rankItem" v-for="(item, index) in data.list" :key="index">
-				<view>{{ item.name }}</view>
-				<view>{{ item.phone.replace(/(?<=\d{3})\d{4}(?=\d{4})/, '...') }}</view>
+			<view class="rankItem" v-for="(item, index) in rank" :key="index">
+				<view>{{ item.username }}</view>
+				<!-- <view>{{ item.mobile.replace(/(?<=\d{3})\d{4}(?=\d{4})/, '...') }}</view> -->
+				<view>{{ item.mobile }}</view>
 				<view>{{ item.hard }}</view>
 				<view>{{ item.simple }}</view>
 				<view>{{ item.old }} </view>
 			</view>
+			<view v-if="!rank.length" class="rankItem">暂无排名</view>
 		</view>
 		<uni-calendar ref="calendar" :insert="false" :lunar="true" @confirm="confirm" />
 		<w-picker ref="Selector" mode="selector" themeColor="#F76454" :selectList="activeList"  @confirm="confirmActice" />
@@ -103,7 +105,7 @@
 </template>
 
 <script>
-	import { _API_OrderSum } from '@/apis/fortune.js'
+	import { _API_OrderSum, _API_OrderRank } from '@/apis/fortune.js'
 	import WPicker from '@/components/w-picker/w-picker.vue'
 	import chartProgress from '@/components/charts/chart-progress.vue'
 	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
@@ -116,32 +118,11 @@
 					0: '',
 					1: ''
 				},
-				data: {
-					money: 123456,
-					pay_money: 45215,
-					no_pay_money: 521,
-					hard: 123,
-					simple: 46,
-					old: 852,
-					hard_all: 861,
-					simple_all: 8541,
-					old_all: 5422,
-					hard_money: 86100,
-					simple_money: 854001,
-					old_money: 542002,
-					list: [
-						{ name: '张三', phone: '18333333333', hard: 10, old: 20, simple: 50 },
-						{ name: '张三', phone: '18333333333', hard: 10, old: 20, simple: 50 },
-						{ name: '张三', phone: '18333333333', hard: 10, old: 20, simple: 50 },
-						{ name: '张三', phone: '18333333333', hard: 10, old: 20, simple: 50 },
-						{ name: '张三', phone: '18333333333', hard: 10, old: 20, simple: 50 },
-					]
-				},
+				data: null,
+				rank: [],
 				choosedActie: -1,
 				activeList: [
-					{ label: '五月活动', value: '1', start: '2020-05-12', end: '2020-06-11' },
-					{ label: '六月活动', value: '2', start: '2020-05-12', end: '2020-06-11' },
-					{ label: '七月活动', value: '3', start: '2020-05-12', end: '2020-06-11' },
+					{ label: '五月重启 强力回归', value: '1', start: '2020-05-12', end: '2020-05-14' }
 				]
 			};
 		},
@@ -196,16 +177,30 @@
 			}
 			this.request()
 		},
+		onPullDownRefresh() {
+			this.request()
+			this.type = 0
+		},
 		methods: {
 			request() {
 				uni.loading()
 				if (this.date[0] && this.date[1]) {
 					_API_OrderSum({ satrt: this.date[0], end: this.date[1] }).then(({ data }) => {
 						this.data = data
+						uni.loading()
+						_API_OrderRank({ satrt: this.date[0], end: this.date[1] }).then(({ data: { list } }) => {
+							list.sort((a, b) => b.all - a.all)
+							this.rank = list
+						})
 					})
 				} else {
-					_API_OrderSum().then(res => {
+					_API_OrderSum().then(({ data }) => {
 						this.data = data
+						uni.loading()
+						_API_OrderRank().then(({ data: { list } }) => {
+							list.sort((a, b) => b.all - a.all)
+							this.rank = list
+						})
 					})
 				}
 			},
@@ -262,9 +257,10 @@
 			.activity {
 				position: absolute;
 				top: 28rpx;
-				right: -28.5rpx;
-				width: 217.5rpx;
+				right: -20rpx;
+				min-width: 217.5rpx;
 				height: 57rpx;
+				padding: 0 24rpx;
 				@include flex();
 				color: #EEEBEB;
 				font-size: 28rpx;
@@ -317,10 +313,12 @@
 				&.active::after {
 					content: "";
 					bottom: 0;
+					left: 50%;
 					height: 4rpx;
 					width: 190rpx;
 					position: absolute;
 					border-radius: 2rpx;
+					transform: translateX(-50%);
 					background: $app-base-color;
 				}
 			}

pages/person-card/person-card.vue

@@ -1,5 +1,20 @@
 <template>
 	<view class="test">
+		<view v-if="showChangeName" class="change-name-wrapper">
+			<view class="change-name">
+				<view class="title">昵称修改</view>
+				<view class="oldName">
+					旧昵称：<input type="text" :value="oldName" disabled />
+				</view>
+				<view class="newName">
+					新昵称：<input type="text" v-model="newName" focus maxlength="12" placeholder="请输入您的新昵称" />
+				</view>
+				<view class="bar">
+					<text @click="showChangeName = false">取消</text>
+					<text class="save" @click="changeName">保存</text>
+				</view>
+			</view>
+		</view>
 		<view class="content">
 			<view class="top-bg">
 				<image :src="info.avatar" mode="widthFix"></image>
@@ -34,6 +49,10 @@
 				<view class="level-lock basecolor" @tap="toogle">{{ open ? '收起' : '显示更多' }}</view>
 			</view>
 			<view class="team-info">
+				<view v-if="this.title == '我的名片'" @tap="showChangeName = true">
+					<text class="left">修改昵称</text>
+					<text class="cuIcon-right"></text>
+				</view>
 				<view @tap="toAuthCard">
 					<text class="left">授权书</text>
 					<text class="cuIcon-right"></text>
@@ -49,6 +68,7 @@
 
 <script>
 	import { _API_TeamPerData } from '@/apis/team.js'
+	import { _API_Proxy_ChangeName } from '@/apis/user.js'
 	export default {
 		data() {
 			return {
@@ -56,6 +76,9 @@
 				info: {},
 				open: false,
 				id: '',
+				showChangeName: false,
+				oldName: this.$store.state.userinfo.nickname,
+				newName: ''
 			}
 		},
 		onLoad(opt) {
@@ -80,6 +103,20 @@
 			},
 			toAuthCard() {
 				uni.navigateTo({ url: `../auth-card/auth-card?id=${this.id}` })
+			},
+			changeName() {
+				if (this.newName.trim()) {
+					uni.loading()
+					_API_Proxy_ChangeName({ nickname: this.newName.trim() }).then(res => {
+						this.info.nickname = this.newName.trim()
+						uni.loading()
+						uni.$emit('INIT')
+						this.showChangeName = false
+						this.newName = ''
+					})
+				} else {
+					uni.toast('新昵称不能为空')
+				}
 			}
 		}
 	}
@@ -88,6 +125,59 @@
 <style lang="scss">
 	.test {
 		@include page();
+		.change-name-wrapper {
+			z-index: 1;
+			width: 100vw;
+			height: 100vh;
+			@include flex();
+			position: fixed;
+			background: rgba(0, 0, 0, .3);
+			.change-name {
+				width: 540rpx;
+				height: 400rpx;
+				font-size: 32rpx;
+				background: #FFFFFF;
+				border-radius: 6rpx;
+				@include flex(column);
+				justify-content: space-between;
+				.title {
+					width: 100%;
+					height: 90rpx;
+					@include flex();
+					
+				}
+				.oldName , .newName {
+					width: 100%;
+					@include flex();
+					justify-content: flex-start;
+					margin-left: 41rpx;
+					input {
+						width: 335rpx;
+						height: 54rpx;
+						border: 1rpx solid #AAAAAA;
+						box-sizing: border-box;
+						padding: 0 8rpx;
+						font-size: 28rpx;
+					}
+				}
+				.bar {
+					width: 100%;
+					height: 76rpx;
+					@include flex();
+					color: #666666;
+					border-top: 1rpx solid #F2F4F5;
+					text {
+						flex: 1;
+						height: 100%;
+						@include flex();
+						&.save {
+							color: $app-base-color;
+							border-left: 1rpx solid #F2F4F5;
+						}
+					}
+				}
+			}
+		}
 		.content {
 			.top-bg {
 				height: 300rpx;

pages/register-examine/register-examine.vue

@@ -159,8 +159,8 @@
 			})
 		},
 		methods: {
-			toExamine(type, index) {
-				uni.navigateTo({ url: `../examine-detail/examine-detail?type=${type}&index=${index}&data=${JSON.stringify(this.lists[type][index])}` })
+			toExamine(type, index) { // 点击立即审核
+				uni.navigateTo({ url: `../examine-detail/examine-detail?type=${type}&index=${index}&data=${encodeURIComponent(JSON.stringify(this.lists[type][index]))}` })
 			},
 			toInvite() {
 				const data = deepClone(this.$store.state.userinfo)

unpackage/dist/build/h5/index.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>大卫博士公众号</title><script src=http://cdn.staticfile.org/jquery/2.1.1/jquery.min.js></script><script src=http://cdn.staticfile.org/jquery.qrcode/1.0/jquery.qrcode.min.js></script><script src=https://cdn.staticfile.org/pako/1.0.10/pako.min.js></script><script src=https://cdn.staticfile.org/Base64/1.0.2/base64.min.js></script><script>document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })</script><style type=text/css>.uni-simple-toast__text {
+				font-size: 24px!important;
+				width: 65vw!important;
+			}
+			.uni-modal__btn_primary, .uni-picker-action-confirm {
+				color: #F76454!important;
+			}</style><link rel=stylesheet href=/gzh/static/index.cdf7f91b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/gzh/static/js/chunk-vendors.933c9aba.js></script><script src=/gzh/static/js/index.f5447e2a.js></script></body></html>