优化各种细节，删除无用，多余的文件

apis/api.js

@@ -1,61 +0,0 @@
-import ajax from '../utils/request.js'
-
-
-export default {
-	// 获取注册身份下拉框信息
-	getIdentifyList(data) {
-		return ajax.get('/sp-admin/app/AppRole/getList', data)
-	},
-	//服务协议
-	getAgreement(data) {
-		return ajax.get('/level-one-server/app/TbAgreement/getById', data)
-	},
-	// 轮播图
-	getBanner(data) {
-		return ajax.get('/level-one-server/app/TbBanner/getList', data)
-	},
-	// 根据职务获取菜单
-	getRoleMenu(data) {
-		return ajax.get('/sp-admin/ReRoleMenu/getList', data)
-	},
-	// 首页菜单
-	getMenu(data) {
-		return ajax.get('/sp-admin/AppMenu/getList', data)
-	},
-	//登录
-	doLogin(data) {
-		return ajax.postForm('/sp-admin/app/AppUser/login', data)
-	},
-	//获取注册手机验证码
-	getPhoneSmsCode() {
-		return ajax.get('/sp-admin/app/AppUser/getPhoneSmsCode')
-	},
-	//注册
-	doRefister(data) {
-		return ajax.postJson('/sp-admin/app/AppUser/register', data)
-	},
-	//获取轮播图
-	getBannerList() {
-		return ajax.get('/level-one-server/app/TbBanner/getList')
-	},
-	//获取最新资讯
-	getNewestList(data) {
-		return ajax.get('/level-one-server/app/TbPortNews/getNewestList', data)
-	},
-	//获取商品列表
-	getGoodsList(data) {
-		return ajax.get('/level-one-server/TbGoodsTransit/getTransitList', data)
-	},
-	//查看商品详情
-	getGoodsDetails(data) {
-		return ajax.get('/level-one-server/TbGoodsTransit/getById', data)
-	},
-	// 添加购物车
-	addCar(data) {
-		return ajax.postJson('/level-one-server/app/TbGoodsCart/addGoodsInShopCart',data)
-	},
-	// 获取商户发布的商品
-	getTransitList() {
-		return ajax.postJson('/level-one-server/app/TbGoodsTransit/getTransitList')
-	} 
-}

common/js/common.js

@@ -1,142 +0,0 @@
-import ajax from '@/utils/request.js'
-export default {
-
-    getuid() {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            var r = Math.random() * 16 | 0,
-                v = c == 'x' ? r : (r & 0x3 | 0x8);
-            return v.toString(16);
-        });
-    },
-
-    // 提示信息
-    toast(msg, icon = 'none', duration = 2000, mask) {
-        uni.showToast({
-            "icon": icon,
-            "title": msg,
-            "mask": mask || false,
-            "duration": duration
-        })
-    },
-    showLoading(msg) {
-        uni.showLoading({
-            'title': msg,
-            'mask': true
-        })
-    },
-    hidingLoading() {
-        uni.hideLoading();
-    },
-    // 提示信息 底部
-    toastBottom(msg, icon = 'none', duration = 2000, mask = false) {
-        uni.showToast({
-            "icon": icon,
-            "title": msg,
-            "mask": mask,
-            "duration": duration,
-            "position": 'bottom'
-        })
-    },
-    // 路由跳转
-    to(url) {
-        uni.navigateTo({
-            url: url,
-            animationType: 'slide-in-right',
-            animationDuration: 300
-        })
-    },
-    toBar(url) {
-        uni.switchTab({
-            url: url
-        })
-    },
-    // 返回上一页
-    back() {
-        uni.navigateBack({
-            delta: 1,
-            animationType: 'pop-out',
-            animationDuration: 200
-        })
-    },
-    // 验证邮箱
-    isEmail(email) {
-        let reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-        if (!reg.test(email)) {
-            this.$common.toast('请输入正确邮箱格式')
-        }
-        return reg.test(email)
-    },
-    // 正则验证是否为手机号
-    isPhone(str) {
-        str = str + '';
-        if ((/^1[3456789]\d{9}$/.test(str))) {
-            return true;
-        }
-        return false;
-    },
-    isNum(str) {
-        str = str + '';
-        if ((/^[0-9]*$/.test(str)) || (/^[0-9]+(.[0-9]{1})?$/.test(str))) {
-            return true;
-        }
-        return false;
-    },
-    isCarNo(str) {
-        str = str + '';
-        let reg =
-            /^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/
-        if (reg.test(str)) {
-            return true;
-        }
-        return false;
-    },
-    removeNull(obj) {
-        var newObj = {};
-        if (obj != undefined && obj != null) {
-            for (var key in obj) {
-                if (obj[key] === undefined || obj[key] === null || obj[key] === '') {
-                    //
-                } else {
-                    newObj[key] = obj[key];
-                }
-            }
-        }
-        return newObj;
-    },
-    isAuth(code) {
-        let list = uni.getStorageSync('perList');
-        return list.indexOf(code) !== -1;
-    },
-    // 将时间戳转化为指定时间
-    // way：方式（1=年月日，2=年月日时分秒）默认1,  也可以指定格式：yyyy-MM-dd HH:mm:ss
-    forDate(inputTime, way) {
-        var date = new Date(inputTime);
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        var minute = date.getMinutes();
-        var second = date.getSeconds();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        second = second < 10 ? ('0' + second) : second;
-        var ms = date.getMilliseconds();
-
-        way = way || 1;
-        // way == 1  年月日
-        if (way === 1) {
-            return y + '-' + m + '-' + d;
-        }
-        // way == 1  年月日时分秒
-        if (way === 2) {
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-        }
-        // way == 具体格式   标准格式: yyyy-MM-dd HH:mm:ss
-        if (typeof way == 'string') {
-            return way.replace("yyyy", y).replace("MM", m).replace("dd", d).replace("HH", h).replace("mm", minute).replace("ss", second).replace("ms", ms);
-        }
-        return y + '-' + m + '-' + d;
-    }
-}

common/style.scss

@@ -263,7 +263,6 @@
 				height: 45px;
 				text-align: left;
 				padding-left: 15px;
-				font-size: 14px;
 				color: $font-c;
 				width: 60%;
 			}
@@ -319,6 +318,7 @@
 	padding: 12px;
 	margin-bottom: 10px;
 	border-radius: 10px;
+	overflow: hidden;
 	.img {
 		float: left;
 		width: 100px;
@@ -375,7 +375,6 @@
 	background-color: white;
 	padding-top: 3px;
 	margin-top: 10px;
-	padding-bottom: 7px;
 	border-radius: 8px;
 	overflow: hidden;
 	.msn {
@@ -448,18 +447,21 @@
 .vlabel {
 	position: relative;
 	color: $font-c;
-	margin-bottom: 10px;
+	margin-bottom: 12px;
+	overflow: hidden;
 	.tag {
 		position: absolute;
 		width: 5px;
 		height: 15px;
 		background-color: $main-color;
 		border-radius: 5px;
-		top: 3px;
+		top: 4px;
 	}
 	.title {
 		margin-left: 10px;
 		float: left;
+		font-size: 17px;
+		font-weight: bold;
 	}
 	.more {
 		float: right;
@@ -517,7 +519,7 @@
 	}
 }
 .search {
-	padding: 12px;
+	padding: 12px 12px 0px 12px;
 }
 .tab {
 	position: relative;

common/util.js

@@ -0,0 +1,221 @@
+function formatTime(time) {
+	if (typeof time !== 'number' || time < 0) {
+		return time
+	}
+
+	var hour = parseInt(time / 3600)
+	time = time % 3600
+	var minute = parseInt(time / 60)
+	time = time % 60
+	var second = time
+
+	return ([hour, minute, second]).map(function(n) {
+		n = n.toString()
+		return n[1] ? n : '0' + n
+	}).join(':')
+}
+
+// 回显数据字典
+const selectDictLabel = (datas, value) => {
+	var actions = [];
+	if (!datas) {
+		return;
+	}
+	Object.keys(datas).some((key) => {
+		if (datas[key].dictValue && datas[key].dictValue == value) {
+			actions.push(datas[key].dictLabel);
+			return true;
+		} else {
+			if (datas[key].id == value) {
+				actions.push(datas[key].typeName);
+				return true;
+			}
+		}
+
+	})
+	return actions.join('');
+}
+
+function formatLocation(longitude, latitude) {
+	if (typeof longitude === 'string' && typeof latitude === 'string') {
+		longitude = parseFloat(longitude)
+		latitude = parseFloat(latitude)
+	}
+
+	longitude = longitude.toFixed(2)
+	latitude = latitude.toFixed(2)
+
+	return {
+		longitude: longitude.toString().split('.'),
+		latitude: latitude.toString().split('.')
+	}
+}
+
+//获取两日期之间日期列表函数
+function getdiffdate(stime, etime) {
+	//初始化日期列表，数组
+	var diffdate = new Array();
+	var i = 0;
+	//开始日期小于等于结束日期,并循环
+	while (stime <= etime) {
+		diffdate[i] = stime;
+
+		//获取开始日期时间戳
+		var stime_ts = new Date(stime).getTime();
+
+		//增加一天时间戳后的日期
+		var next_date = stime_ts + (24 * 60 * 60 * 1000);
+
+		//拼接年月日，这里的月份会返回（0-11），所以要+1
+		var next_dates_y = new Date(next_date).getFullYear() + '-';
+		var next_dates_m = (new Date(next_date).getMonth() + 1 < 10) ? '0' + (new Date(next_date).getMonth() + 1) +
+			'-' : (new Date(next_date).getMonth() + 1) + '-';
+		var next_dates_d = (new Date(next_date).getDate() < 10) ? '0' + new Date(next_date).getDate() : new Date(
+			next_date).getDate();
+
+		stime = next_dates_y + next_dates_m + next_dates_d;
+
+		//增加数组key
+		i++;
+	}
+	return diffdate;
+}
+/**
+ * 计算两个日期之间的天数
+ * @param dateString1  开始日期 yyyy-MM-dd
+ * @param dateString2  结束日期 yyyy-MM-dd
+ * @returns {number} 如果日期相同 返回一天 开始日期大于结束日期，返回0
+ */
+const getDaysBetween = (dateString1, dateString2) => {
+	let startDate = Date.parse(dateString1);
+	let endDate = Date.parse(dateString2);
+	if (startDate > endDate) {
+		return 0;
+	}
+	if (startDate == endDate) {
+		return 1;
+	}
+	let days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
+	return days.toFixed(0);
+}
+/**
+ * 乘法函数，用来得到精确的乘法结果
+ * @param {Object} arg1
+ * @param {Object} arg2
+ */
+const accMul = (arg1, arg2) => {
+	var m = 0;
+	m += deal(arg1);
+	m += deal(arg2);
+	var r1 = Number(arg1.toString().replace('.', ''));
+	var r2 = Number(arg2.toString().replace('.', ''));
+	return (r1 * r2) / Math.pow(10, m);
+}
+/**
+ * 加法函数，用来得到精确的加法结果
+ * @param {Object} arg1
+ * @param {Object} arg2
+ */
+const accAdd = (arg1, arg2) => {
+	var r1 = deal(arg1);
+	var r2 = deal(arg2);
+	var m = Math.pow(10, Math.max(r1, r2));
+	return (arg1 * m + arg2 * m) / m;
+}
+const hasPermi = (permi) => {
+	let list = uni.getStorageSync('permissions');
+	let has = list.filter(item => item == permi);
+	return has.length > 0 ? true : false;
+}
+/**
+ * 除法函数，用来得到精确的除法结果
+ * @param {Object} arg1
+ * @param {Object} arg2
+ */
+const accDiv = (arg1, arg2) => {
+	var t1 = deal(arg1);
+	var t2 = deal(arg2);
+	var r1 = Number(arg1.toString().replace(".", ""))
+	var r2 = Number(arg2.toString().replace(".", ""))
+	return (r1 / r2) * Math.pow(10, t2 - t1);
+}
+/**
+ * 求小数点后的数据长度
+ */
+const deal = (arg) => {
+	var t = 0;
+	try {
+		t = arg.toString().split('.')[1].length;
+	} catch (e) {}
+	return t;
+}
+/**
+ * 判断 有效日期不能小于今天
+ */
+const dateCompare = (beginDate, endDate) => {
+	var beginArrayDate = beginDate.split('-');
+	var endArrayDate = endDate.split('-')
+	if (parseInt(endArrayDate[0], 10) > parseInt(beginArrayDate[0], 10)) return true;
+	if (parseInt(endArrayDate[0], 10) == parseInt(beginArrayDate[0], 10)) {
+		if (parseInt(endArrayDate[1], 10) > parseInt(beginArrayDate[1], 10)) return true;
+		else {
+			if (parseInt(endArrayDate[1], 10) == parseInt(beginArrayDate[1], 10)) {
+				if (parseInt(endArrayDate[2], 10) >= parseInt(beginArrayDate[2], 10)) return true;
+			}
+		}
+	}
+	return false;
+}
+/**
+ * 获取日期
+ * day 获取日期
+ * time 获取时间
+ */
+const getDate = (obj = 'day') => {
+	const date = new Date();
+	let year = date.getFullYear();
+	let month = date.getMonth() + 1;
+	let day = date.getDate();
+	let Hours = date.getHours();
+	let Minutes = date.getMinutes();
+	month = month > 9 ? month : '0' + month;
+	day = day > 9 ? day : '0' + day;
+	Hours = Hours > 9 ? Hours : '0' + Hours;
+	Minutes = Minutes > 9 ? Minutes : '0' + Minutes;
+	if (obj == 'day') {
+		return `${year}-${month}-${day}`;
+	}
+	if (obj == 'time') {
+		return `${year}-${month}-${day}` + ' ' + Hours + ':' + Minutes;
+	}
+}
+/**
+ * 格式化时间
+ */
+const format = (obj) => {
+	const date = new Date(obj);
+	let year = date.getFullYear();
+	let month = date.getMonth() + 1;
+	let day = date.getDate();
+	let Hours = date.getHours();
+	let Minutes = date.getMinutes();
+	month = month > 9 ? month : '0' + month;
+	day = day > 9 ? day : '0' + day;
+	Hours = Hours > 9 ? Hours : '0' + Hours;
+	Minutes = Minutes > 9 ? Minutes : '0' + Minutes;
+	return `${year}-${month}-${day}` + ' ' + Hours + ':' + Minutes;
+}
+
+module.exports = {
+	formatTime: formatTime,
+	formatLocation: formatLocation,
+	accMul: accMul,
+	accAdd: accAdd,
+	accDiv: accDiv,
+	dateCompare: dateCompare,
+	getDate: getDate,
+	getDaysBetween: getDaysBetween,
+	getdiffdate: getdiffdate,
+	selectDictLabel: selectDictLabel,
+	hasPermi:hasPermi
+}

main.js

@@ -1,20 +1,17 @@
 import App from './App'
-import api from '@/apis/api.js'
-import common from '@/common/js/common.js'
 import uView from "uview-ui";
 import verify from './common/graceChecker.js' //数据校验证
 import http from './common/http.js'
+import util from './common/util.js' //工具类
 
 Vue.use(uView);
 // #ifndef VUE3
 import Vue from 'vue'
 Vue.config.productionTip = false
 App.mpType = 'app'
-Vue.prototype.$api = api
-Vue.prototype.$common = common
 Vue.prototype.verify = verify;
 Vue.prototype.http = http;
-
+Vue.prototype.util = util;
 Vue.prototype.getUser = function() {
 	return uni.getStorageSync('info');
 }

pages.json

@@ -25,7 +25,7 @@
 		}, {
 			"path": "pages/login/userAgreement",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "用户协议",
 				"enablePullDownRefresh": false
 			}
 

pages/index/index.vue

@@ -9,7 +9,7 @@
 				<view class="icon" @click="scanCode()">&#xe60d;</view>
 			</view>
 			<!--轮播图-->
-			<u-swiper circular :radius="5" :indicator="true" keyName="image" :list="bannerList" :height="140" class="uni-swiper" @click="click"></u-swiper>
+			<u-swiper circular :radius="5" :indicator="true" keyName="image" :list="bannerList" :height="110" class="uni-swiper" @click="click"></u-swiper>
 			<!--通知公告-->
 			<view class="notice">
 				<u-notice-bar color="#848484" :text="noticeList" :step="true" direction="column" mode="link" bgColor="white" speed="300" url="/pages/notice/index"></u-notice-bar>
@@ -19,7 +19,7 @@
 				<view class="msn" v-for="(item, index) in menuList" :key="index" @click="navTo(item.path)">
 					<view class="out">
 						<view class="int">
-							<u-icon :name="item.icon" color="white" size="25" :custom-style="{ margin: '0 auto' }" class="ioc"></u-icon>
+							<image :src="item.icon" mode="widthFix" style="width: 54px;height: 54px;"></image>
 							<view class="tit">{{ item.menuName }}</view>
 						</view>
 					</view>
@@ -32,20 +32,15 @@
 					<view class="tag"></view>
 					<text class="title">最新资讯</text>
 					<text class="more" @click="navTo('/pages/news/list')">更多</text>
-					<view class="clear"></view>
 				</view>
 				<view class="list">
 					<view class="news_item" v-for="(item, index) in newsList" :key="index" @click="go('/pages/news/detail?id=' + item.id)">
 						<image src="../../static/news.jpg" mode="aspectFill" class="img"></image>
 						<view class="con">
 							<view class="title ellip">{{ item.title }}</view>
-							<view class="date">
-								<text class="icon">&#xe65c;</text>
-								<text>{{ item.readCount }}</text>
-							</view>
-							<text class="releaseTime">{{ item.releaseTime }}</text>
+							<view class="source omit">{{ item.source }}</view>
+							<view class="releaseTime">{{ item.releaseTime }}</view>
 						</view>
-						<view class="clear"></view>
 					</view>
 				</view>
 			</view>
@@ -68,8 +63,7 @@ export default {
 	onLoad() {
 		this.getBannerList();
 		this.getNewsList();
-		// this.getRoleMenu();
-		this.getMenu();
+	    this.getRoleMenu();
 	},
 	methods: {
 		getBannerList() {
@@ -111,31 +105,31 @@ export default {
 					});
 				}
 			});
-			console.log(this.menuList)
+			console.log(this.menuList);
 		},
 		getNewsList() {
 			this.http.request({
 				url: '/level-one-server/app/TbPortNews/getNewestList',
-				data: { limit: 4 },
+				data: { limit: 5 },
 				success: res => {
 					this.newsList = res.data.data;
 				}
 			});
 		},
 		navTo(url) {
-			let info = this.getUser()
-			if(info.userType == 4 && url=='/pages/market/one/list'){
+			let info = this.getUser();
+			if (info.userType == 4 && url == '/pages/market/one/list') {
 				uni.showToast({
 					title: '您当前无权限查看该选项',
-					icon:'none',
-				})
+					icon: 'none'
+				});
 				return;
 			}
-			if(info.userType == 3 && url=='/pages/market/two/list'){
+			if (info.userType == 3 && url == '/pages/market/two/list') {
 				uni.showToast({
 					title: '您当前无权限查看该选项',
-					icon:'none',
-				})
+					icon: 'none'
+				});
 				return;
 			}
 			uni.navigateTo({
@@ -148,13 +142,13 @@ export default {
 		},
 		go(url) {
 			uni.navigateTo({ url: url });
-		},
+		}
 	}
 };
 </script>
 <style lang="scss">
 page {
-	background-color: #f6f6f7;
+	background-color: $pg;
 }
 .top {
 	width: 100%;
@@ -187,46 +181,8 @@ page {
 		border-radius: 5px !important;
 		overflow: hidden;
 	}
-	.menu {
-		background-color: white;
-		padding-top: 3px;
-		margin-top: 10px;
-		padding-bottom: 7px;
-		border-radius: 5px;
-		.msn {
-			float: left;
-			width: 25%;
-			text-align: center;
-			.out {
-				padding: 3px;
-				.int {
-					padding: 5px;
-					animation: bounceIn 1s;
-					.ioc {
-						width: 45px;
-						height: 45px;
-						background-color: #1c9dff;
-						border-radius: 50%;
-						margin: 0 auto;
-						line-height: 46px;
-						.icon {
-							font-size: 23px;
-							color: white;
-						}
-					}
-					.tit {
-						font-size: 14px;
-						margin-top: 5px;
-						color: $font-c;
-					}
-				}
-			}
-		}
-	}
 	.news {
-		background-color: white;
-		margin-top: 10px;
-		padding: 10px;
+		margin-top: 15px;
 	}
 }
 </style>

pages/login/chooseRole.vue

@@ -1,15 +1,15 @@
 <template>
-	<view class="list">
+	<view class="list animated fadeInDown">
 		<view class="item" :class="{ active: current == index }" v-for="(item, index) in roles" :key="index" @click="current = index">
 			<view class="title">我是{{ item.roleName }}</view>
-			<image src="../../static/images/role/bm.png" mode="widthFix" v-if="index == 0"></image>
+			<image src="../../static/images/role/sh.png" mode="widthFix" v-if="index == 0"></image>
 			<image src="../../static/images/role/sj.png" mode="widthFix" v-if="index == 1"></image>
-			<image src="../../static/images/role/wjsh.png" mode="widthFix" v-if="index == 2"></image>
-			<image src="../../static/images/role/jxs.png" mode="widthFix" v-if="index == 3"></image>
+			<image src="../../static/images/role/sgs.png" mode="widthFix" v-if="index == 2"></image>
+			<image src="../../static/images/role/zz.png" mode="widthFix" v-if="index == 3"></image>
 			<image src="../../static/images/role/bm.png" mode="widthFix" v-if="index == 4"></image>
 			<view class="clear"></view>
 		</view>
-		<button class="btn" @click="next()" :disabled="current==-1">下一步</button>
+		<button class="btn" @click="next()" :disabled="current == -1">下一步</button>
 	</view>
 </template>
 
@@ -34,23 +34,24 @@ export default {
 			});
 		},
 		next() {
-			uni.navigateTo({
-				url: '/pages/login/register?type=' + this.roles[this.current].id
-			});
+			uni.navigateTo({ url: '/pages/login/register?type=' + this.roles[this.current].id });
 		}
 	}
 };
 </script>
 
 <style lang="scss">
+page {
+	background-color: $pg;
+}
 .list {
 	padding: 20px;
 	.item {
 		margin-top: 15px;
-		background-color: #fff7f7;
+		background-color: white;
 		height: 100px;
 		position: relative;
-		border-radius: 8px;
+		border-radius: 12px;
 		&.active {
 			border: 2px solid $main-color;
 		}

pages/login/login.vue

@@ -1,24 +1,24 @@
 <template>
 	<view class="login">
 		<view class="app_top">
-			<view class="welcome">
+			<view class="welcome animated bounceIn">
 				<view class="desc">您好,</view>
 				<view class="desc">欢迎来到边民互市贸易</view>
 			</view>
 			<image src="../../static/images/my.png" mode="widthFix" class="img"></image>
 		</view>
-		<view class="dk">
+		<view class="dk animated fadeInDown">
 			<view class="bg">
 				<text class="icon">&#xe8b9;</text>
-				<input type="number" v-model="form.phone" maxlength="11" placeholder="请输入手机号" />
+				<input type="number" v-model="item.phone" maxlength="11" placeholder="请输入手机号" />
 			</view>
 			<view class="bg">
 				<text class="icon">&#xe8b2;</text>
-				<input :password="show" v-model="form.password" placeholder="请输入密码" />
+				<input :password="show" v-model="item.password" placeholder="请输入密码" />
 				<view class="label"><view class="icon" :class="{ active: !show }" @click="show = !show">&#xe7a6;</view></view>
 			</view>
 			<view class="xy">
-				<u-checkbox-group class="checkbox" v-model="form.checked">
+				<u-checkbox-group class="checkbox" v-model="item.checked">
 					<u-checkbox size="15" shape="circle" label="我已阅读并同意" labelSize="13" name="true"></u-checkbox>
 				</u-checkbox-group>
 				<text class="a" @click="go('/pages/login/userAgreement?id=1')">《用户协议》</text>
@@ -36,7 +36,7 @@ export default {
 	data() {
 		return {
 			show: true,
-			form: {}
+			item: {}
 		};
 	},
 	onLoad() {
@@ -49,24 +49,28 @@ export default {
 	methods: {
 		submit() {
 			let rule = [
-				{ name: 'phone', checkType: 'phone', errorMsg: '请输入正确的手机号码' },
+				{ name: 'phone', checkType: 'notnull', errorMsg: '手机号不能为空' },
+			/* 	{ name: 'phone', checkType: 'phoneno', errorMsg: '请输入正确的手机号' }, */
 				{ name: 'password', checkType: 'notnull', errorMsg: '请输入密码' },
 				{ name: 'checked', checkType: 'notnull', errorMsg: '请同意并勾选协议' }
 			];
-			if (!this.verify.check(this.form, rule)) {
+			if (!this.verify.check(this.item, rule)) {
 				uni.showModal({ content: this.verify.error, showCancel: false });
 				return false;
 			}
 			this.http.request({
 				url: '/sp-admin/app/AppUser/login',
-				data: this.form,
+				data: this.item,
 				method: 'POST',
-				success: resp => {
-					let data = resp.data.data;
+				success: res => {
+					let data = res.data.data;
 					uni.setStorageSync('token', data.tokenInfo.tokenValue);
 					uni.setStorageSync('info', data.appUser);
 					uni.setStorageSync('menu', data.per_list);
-					uni.switchTab({ url: '/pages/index/index' });
+					uni.showToast({ title: '登录成功' });
+					setTimeout(() => {
+						uni.switchTab({ url: '/pages/index/index' });
+					}, 1000);
 				}
 			});
 		},
@@ -77,8 +81,4 @@ export default {
 };
 </script>
 
-<style lang="scss">
-page {
-	background-color: white;
-}
-</style>
+<style lang="scss"></style>

pages/login/register.vue

@@ -1,148 +1,120 @@
 <template>
-	<view class="login">
+	<view class="login animated fadeInDown">
 		<view class="dk" style="margin-top: 30px">
 			<view class="bg">
 				<text class="icon">&#xe8b9;</text>
-				<input type="number" maxlength="11" v-model="form.phone" placeholder="请输入手机号" />
+				<input type="number" maxlength="11" v-model="item.phone" placeholder="请输入手机号" />
 			</view>
 			<view class="bg">
 				<text class="icon">&#xe624;</text>
-				<input type="number" v-model="form.smsCode" placeholder="验证码" />
-				<view class="label">获取验证码</view>
+				<input type="number" v-model="item.smsCode" placeholder="验证码" />
+				<view class="label" @click="getCode()">{{ msg }}</view>
 			</view>
 			<view class="bg">
 				<text class="icon">&#xe8b2;</text>
-				<input :password="show" v-model="form.password" placeholder="请输入密码" />
+				<input :password="show" v-model="item.password" placeholder="请输入密码" />
 				<view class="label">
 					<view class="icon" :class="{ active: !show }" @click="show = !show">&#xe7a6;</view>
 				</view>
 			</view>
 			<view class="bg">
 				<text class="icon">&#xe8b2;</text>
-				<input :password="show" v-model="form.rePassword" placeholder="确认密码" />
+				<input :password="show" v-model="item.rePassword" placeholder="确认密码" />
 				<view class="label">
 					<view class="icon" :class="{ active: !show }" @click="show = !show">&#xe7a6;</view>
 				</view>
 			</view>
 			<view class="xy">
-				<u-checkbox-group class="checkbox" v-model="form.checked">
+				<u-checkbox-group class="checkbox" v-model="item.checked">
 					<u-checkbox size="15" shape="circle" label="我已阅读并同意" labelSize="13" name="true"></u-checkbox>
 				</u-checkbox-group>
-				<text class="a" @click="getAgreement(1)">《用户协议》</text>
+				<text class="a" @click="go('/pages/login/userAgreement?id=1')">《用户协议》</text>
 				<text>和</text>
-				<text class="a" @click="getAgreement(2)">《隐私政策》</text>
+				<text class="a" @click="go('/pages/login/userAgreement?id=2')">《隐私政策》</text>
 			</view>
 			<button class="btn" @click="submit()">确定</button>
-			<button class="btn register" @click="toLogin()">返回</button>
+			<button class="btn register" @click="back()">返回</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				show: true,
-				time: 60,
-				code: '获取验证码',
-				form: {}
-			};
-		},
-		onLoad(option) {
-			this.form.type = option.type;
-		},
-		created() {},
-		methods: {
-			startCount() {
-				setTimeout(() => {
-					let time = this.time;
-					if (time == 0) {
-						this.code = '重新获取';
-						this.time = 60;
-						return;
-					}
-					this.time = --time;
-					this.code = time + '后重新获取';
-					this.startCount();
-				}, 1000);
-			},
-			getCode() {
-				let time = this.time;
-				if (time > 0 && time < 60) {
-					return;
-				}
-				let phone = this.form.phone;
-				if (!this.$common.isPhone(phone)) {
-					this.$common.toast('请输入正确的手机号');
-					return;
-				}
-				this.startCount();
-				this.$api.getPhoneSmsCode().then(resp => {
-					this.$common.toast('已发送');
-				});
-			},
-			submit() {
-				let rule = [{
-						name: 'phone',
-						checkType: 'phone',
-						errorMsg: '请输入正确的手机号码'
-					},
-					{
-						name: 'smsCode',
-						checkType: 'notnull',
-						errorMsg: '请输入验证码'
-					},
-					{
-						name: 'password',
-						checkType: 'notnull',
-						errorMsg: '请输入密码'
-					},
-					{
-						name: 'rePassword',
-						checkType: 'same',
-						checkRule: this.form.password,
-						errorMsg: '两次输入不一致'
-					},
-					{
-						name: 'checked',
-						checkType: 'notnull',
-						errorMsg: '请同意并勾选协议'
-					}
-				];
-				if (!this.verify.check(this.form, rule)) {
-					uni.showModal({
-						content: this.verify.error,
-						showCancel: false
-					});
-					return false;
+export default {
+	data() {
+		return {
+			show: true,
+			time: 60,
+			flag: true,
+			msg: '获取验证码',
+			item: {}
+		};
+	},
+	onLoad(option) {
+		this.item.type = option.type;
+	},
+	methods: {
+		//发送短信验证码
+		getCode() {
+			if (!this.flag) {
+				return;
+			}
+			let rule = [{ name: 'phone', checkType: 'notnull', errorMsg: '请输入正确的手机号' }];
+			if (!this.verify.check(this.item, rule)) {
+				uni.showModal({ content: this.verify.error, showCancel: false });
+				return false;
+			}
+			this.http.request({
+				url: '/sp-admin/app/AppUser/getPhoneSmsCode?phone=' + this.item.phone,
+				success: res => {
+					uni.showToast({ title: '发送成功' });
+					//一分钟倒计时
+					var countdown = setInterval(() => {
+						this.time--;
+						if (this.time == 0) {
+							this.flag = true;
+							this.msg = '获取短信';
+							this.time = 60;
+							clearInterval(countdown);
+						} else {
+							this.flag = false;
+							this.msg = '重新获取(' + this.time + ')';
+						}
+					}, 1000);
 				}
-				this.http.request({
-					url: '/sp-admin/app/AppUser/register',
-					data: this.form,
-					contentType: 'application/json; charset=utf-8',
-					method: 'POST',
-					success: resp => {
-						setTimeout(function (){
-							uni.showToast({title: '注册成功'});
-							uni.navigateTo({
-								url: '/pages/login/login'
-							});
-						},1000)
-					}
-				});
-			},
-			toLogin() {
-				uni.navigateTo({
-					url: '/pages/login/login'
-				});
-			},
-			getAgreement(id) {
-				uni.navigateTo({
-					url: '/pages/login/userAgreement?id=' + id
-				});
+			});
+		},
+		submit() {
+			let rule = [
+				{ name: 'phone', checkType: 'phone', errorMsg: '请输入正确的手机号码' },
+				{ name: 'smsCode', checkType: 'notnull', errorMsg: '请输入验证码' },
+				{ name: 'password', checkType: 'notnull', errorMsg: '请输入密码' },
+				{ name: 'rePassword', checkType: 'same', checkRule: this.item.password, errorMsg: '两次输入不一致' },
+				{ name: 'checked', checkType: 'notnull', errorMsg: '请同意并勾选协议' }
+			];
+			if (!this.verify.check(this.item, rule)) {
+				uni.showModal({ content: this.verify.error, showCancel: false });
+				return false;
 			}
+			this.http.request({
+				url: '/sp-admin/app/AppUser/register',
+				data: this.item,
+				method: 'POST',
+				success: resp => {
+					uni.showToast({ title: '注册成功' });
+					setTimeout(() => {
+						uni.navigateTo({ url: '/pages/login/login' });
+					}, 1000);
+				}
+			});
+		},
+		go(url) {
+			uni.navigateTo({ url: url });
+		},
+		back() {
+			uni.navigateBack();
 		}
-	};
+	}
+};
 </script>
 
-<style lang="scss"></style>
+<style lang="scss"></style>

pages/login/userAgreement.vue

@@ -1,53 +1,43 @@
 <template>
 	<view>
-		<navigation-bar :title="title" background-color="#fff" front-color="#000000" />
-		<view style="margin-bottom: 15px;" v-html="content"></view>
-		<u-button type="primary" shape="circle" text="我已知晓并同意" @click="back()"></u-button>
+		<u-parse :content="content" class="content"></u-parse>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" @click="back()">我已知晓并同意</button>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
-
 <script>
-	export default {
-		data() {
-			return {
-				id: 0,
-				content: '',
-				title: '',
-			}
-		},
-		onLoad(option) {
-			this.id = option.id
-		},
-		created() {
-			this.getAgreement()
-		},
-		methods: {
-			getAgreement() {
-				let params = {
-					id: this.id
+export default {
+	data() {
+		return {
+			content: ''
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.http.request({
+				url: '/level-one-server/app/TbAgreement/getById?id=' + e.id,
+				success: res => {
+					this.content = res.data.data.content;
+					uni.setNavigationBarTitle({ title: res.data.data.type });
 				}
-				this.http.request({
-					url: '/level-one-server/app/TbAgreement/getById',
-					data: params,
-					method: 'get',
-					success: res => {
-						let data = res.data.data
-						this.title = data.type
-						this.content = data.content
-					}
-				});
-			},
-			back() {
-				uni.navigateBack({
-					delta: 1,
-				})
-			}
+			});
+		}
+	},
+	methods: {
+		back() {
+			uni.navigateBack();
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		padding: 10px;
-	}
-</style>
+.content {
+	padding: 18px 18px 90px 18px;
+}
+</style>

pages/market/two/leader/order.vue

@@ -6,17 +6,11 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">广西京东自营店南宁分店</view>
-				<view class="state" v-if="item.goodsStatus == 1">
-					<text class="icon" style="color: #13ce66">&#xe830;</text>
-					<text>已完成</text>
-				</view>
-				<view class="state" v-else>
-					<text class="icon" style="color: #f44336">&#xe622;</text>
-					<text>下架</text>
-				</view>
+				<view class="state" style="color: #4581fb" v-if="item.orderFinish == 1">已确认</view>
+				<view class="state" style="color: #4581fb" v-if="item.orderFinish == 2">已完成</view>
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
-					<view class="productName omit">八角茴香（未磨）（可食用）</view>
+					<view class="productName omit">{{item.goodsName}}</view>
 					<view class="desc omit">
 						<text>50吨</text>
 						<text>云南互市区云南互市区云南互市区云南互市区云南互市区</text>
@@ -42,12 +36,10 @@ export default {
 		return {
 			tab: [
 				{ name: '全部', goodsStatus: '' },
-				{ name: '待确认', goodsStatus: 1 },
 				{ name: '已确认', goodsStatus: 0 },
-				{ name: '已完成', goodsStatus: 0 },
-				{ name: '已取消', goodsStatus: 0 }
+				{ name: '已完成', goodsStatus: 0 }
 			],
-			param: { pageNo: 1, pageSize: 10, isOrders: 0 },
+			param: { pageNo: 1, pageSize: 10 },
 			list: [],
 			loadMore: true
 		};

pages/market/two/list.vue

@@ -95,9 +95,6 @@ export default {
 page {
 	background-color: $pg;
 }
-.search {
-	padding: 12px 12px 0px 12px;
-}
 .btn {
 	width: 120rpx;
 	height: 40rpx;

pages/news/detail.vue

@@ -1,7 +1,16 @@
 <template>
 	<view class="cmain">
+		<view class="title">{{ item.title }}</view>
+		<view class="desc">
+			<text class="source">{{ item.source }}</text>
+			<text>{{ item.createTime }}</text>
+			<view class="read">
+				<text class="icon">&#xe639;</text>
+				<text>{{ item.readCount }}</text>
+			</view>
+		</view>
 		<u-divider :dot="true"></u-divider>
-		<u-parse :content="content"></u-parse>
+		<u-parse :content="item.content"></u-parse>
 	</view>
 </template>
 
@@ -9,16 +18,16 @@
 export default {
 	data() {
 		return {
-			content:''
+			item: {}
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsDetails',
-				data: { id: e.id },
+				url: '/level-one-server/app/TbPortNews/getById?id=' + e.id,
 				success: res => {
-					this.content = res.data.data;
+					this.item = res.data.data;
+					this.item.content = this.item.content.replace(/\<img/gi, '<img style="border-radius: 5px;"');
 				}
 			});
 		}
@@ -26,4 +35,36 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+	.cmain{
+		padding: 20px 16px 15px 16px;
+		.title {
+			font-weight: bold;
+			color: #192b20;
+			line-height: 32px;
+			font-size: 22px;
+		}
+		.desc {
+			margin-top: 10px;
+			overflow: hidden;
+			color: #a0a2a6;
+			text {
+				float: left;
+			}
+			.source {
+				color: #0081ff;
+				margin-right: 10px;
+			}
+			margin-right: 10px;
+			.read {
+				float: right;
+				margin-top: -2px;
+				.icon{
+					padding-right: 3px;
+					float: left;
+					margin-top: 2px;
+				}
+			}
+		}
+	}
+</style>

pages/news/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="search">
-			<u-search placeholder="搜索资讯" v-model="param.title" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+			<u-search placeholder="搜索资讯" v-model="param.title"  bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
 		</view>
 		<view class="list">
 			<view class="news_item" v-for="(item, index) in list" :key="index" @click="detail(item)">
@@ -9,9 +9,8 @@
 				<view class="con">
 					<view class="title ellip">{{ item.title }}</view>
 					<view class="source omit">{{ item.source }}</view>
-					<text class="releaseTime">{{ item.releaseTime }}</text>
+					<view class="releaseTime">{{ item.releaseTime }}</view>
 				</view>
-				<view class="clear"></view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
 			<u-empty v-if="!loadMore && list.length == 0"></u-empty>

pages/personal/personal.vue

@@ -47,44 +47,44 @@
 					</view>
 				</view>
 			</view>
-			<!--外籍商户-->
+			<!--收购商-->
 			<view class="menu" v-if="user.userType == 3">
-				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')">
+				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">商品管理</view>
+							<view class="tit">采购需求</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn" @click="go('/pages/market/one/merchant/order/list')">
+				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">我的订单</view>
+							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
+							<view class="tit">地址管理</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<!--收购商-->
-			<view class="menu" v-if="user.userType == 5">
-				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
+				<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">采购需求</view>
+							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+							<view class="tit">我的订单</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
+			</view>
+			<!--外籍商户-->
+			<view class="menu" v-if="user.userType == 5">
+				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')">
 					<view class="out">
 						<view class="int">
-							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
-							<view class="tit">地址管理</view>
+							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
+							<view class="tit">商品管理</view>
 						</view>
 					</view>
 				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
+				<view class="msn" @click="go('/pages/market/one/merchant/order/list')">
 					<view class="out">
 						<view class="int">
 							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
@@ -156,7 +156,7 @@ export default {
 			uni.removeStorageSync('token');
 			uni.removeStorageSync('info');
 			uni.removeStorageSync('menu');
-			this.$common.to('/pages/login/login');
+			uni.redirectTo({ url: '/pages/login/login' });
 		}
 	}
 };
@@ -215,6 +215,6 @@ page {
 .exit {
 	margin-top: 20px;
 	background-color: white;
-	color: #F44336;
+	color: #f44336;
 }
 </style>

utils/request.js

@@ -1,187 +0,0 @@
-// const server = 'http://127.0.0.1:8080';
-const server = 'http://192.168.88.34:8080';
-
-
-
-import common from '../common/js/common.js';
-
-function get(url, data) {
-	uni.showLoading({
-		title: '正在加载',
-		mask: true
-	});
-	return uni.request({
-		method: 'get',
-		url: server + url,
-		data: data || {},
-		header: {
-			'Content-type': 'application/x-www-form-urlencoded',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			let resp=res.data;
-			if(resp.code==401){
-				uni.removeStorageSync('token');
-				common.to('/pages/login/login');
-				return ;
-			}
-			return res.data
-		}
-	})
-}
-
-function postForm(url, data) {
-	common.showLoading('正在提交...')
-	return uni.request({
-		method: 'post',
-		url: server + url,
-		data: data || {},
-		dataType: 'json',
-		header: {
-			'Content-type': 'application/x-www-form-urlencoded',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			let reData = res.data;
-			if (reData.code !== 200) {
-				uni.showToast({
-					"icon": 'none',
-					"title": reData.msg,
-					"mask": false,
-					"duration": 3000,
-					"position": 'bottom'
-				})
-				return res.data;
-			}
-			return res.data
-		}
-	})
-}
-
-function postJson(url, data) {
-	common.showLoading('正在提交...')
-	return uni.request({
-		method: 'post',
-		url: server + url,
-		data: JSON.stringify(data),
-		dataType: 'json',
-		header: {
-			'Content-type': 'application/json; charset=utf-8',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			let reData = res.data;
-			if (reData.code !== 200) {
-				uni.showToast({
-					"icon": 'none',
-					"title": reData.msg,
-					"mask": false,
-					"duration": 3000,
-					"position": 'bottom'
-				})
-				return res.data;
-			}
-			return res.data
-		}
-	})
-}
-function postJsonNotLoading(url, data) {
-	return uni.request({
-		method: 'post',
-		url: server + url,
-		data: JSON.stringify(data),
-		dataType: 'json',
-		header: {
-			'Content-type': 'application/json; charset=utf-8',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			let reData = res.data;
-			if (reData.code !== 200) {
-				uni.showToast({
-					"icon": 'none',
-					"title": reData.msg,
-					"mask": false,
-					"duration": 3000,
-					"position": 'bottom'
-				})
-				return res.data;
-			}
-			return res.data
-		}
-	})
-}
-
-function deleteFn(url, data) {
-	common.showLoading('正在删除...')
-	return uni.request({
-		method: 'delete',
-		url: server + url,
-		data: data || {},
-		dataType: 'json',
-		header: {
-			'Content-type': 'application/x-www-form-urlencoded',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			return res.data
-		}
-	})
-}
-
-function put(url, data) {
-	common.showLoading('正在提交...')
-	return uni.request({
-		method: 'put',
-		url: server + url,
-		data: JSON.stringify(data),
-		dataType: 'json',
-		header: {
-			'Content-type': 'application/json; charset=utf-8',
-			'satoken': uni.getStorageSync('token')
-		}
-	}).then(data => {
-		common.hidingLoading();
-		var [err, res] = data
-		if (err) {
-			return err
-		} else {
-			return res.data
-		}
-	})
-}
-
-export default {
-	get,
-	deleteFn,
-	put,
-	postForm,
-	postJson,
-	postJsonNotLoading,
-	server
-}