阿里云上传

12 months ago · 65c39e3a30
parent 7587b2cc5d
commit 65c39e3a30
16 changed files with 869 additions and 68 deletions
--- a/libs/Oss/base64.js
+++ b/libs/Oss/base64.js
@ -0,0 +1,135 @@
+export const Base64 = {
+
+	// private property
+	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+	// public method for encoding
+	encode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = Base64._utf8_encode(input);
+
+		while (i < input.length) {
+
+			chr1 = input.charCodeAt(i++);
+			chr2 = input.charCodeAt(i++);
+			chr3 = input.charCodeAt(i++);
+
+			enc1 = chr1 >> 2;
+			enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+			enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+			enc4 = chr3 & 63;
+
+			if (isNaN(chr2)) {
+				enc3 = enc4 = 64;
+			} else if (isNaN(chr3)) {
+				enc4 = 64;
+			}
+
+			output = output +
+			this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+			this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+		}
+
+		return output;
+	},
+
+	// public method for decoding
+	decode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3;
+		var enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+		while (i < input.length) {
+
+			enc1 = this._keyStr.indexOf(input.charAt(i++));
+			enc2 = this._keyStr.indexOf(input.charAt(i++));
+			enc3 = this._keyStr.indexOf(input.charAt(i++));
+			enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+			chr1 = (enc1 << 2) | (enc2 >> 4);
+			chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+			chr3 = ((enc3 & 3) << 6) | enc4;
+
+			output = output + String.fromCharCode(chr1);
+
+			if (enc3 != 64) {
+				output = output + String.fromCharCode(chr2);
+			}
+			if (enc4 != 64) {
+				output = output + String.fromCharCode(chr3);
+			}
+
+		}
+
+		output = Base64._utf8_decode(output);
+
+		return output;
+
+	},
+
+	// private method for UTF-8 encoding
+	_utf8_encode : function (string) {
+		string = string.replace(/\r\n/g,"\n");
+		var utftext = "";
+
+		for (var n = 0; n < string.length; n++) {
+
+			var c = string.charCodeAt(n);
+
+			if (c < 128) {
+				utftext += String.fromCharCode(c);
+			}
+			else if((c > 127) && (c < 2048)) {
+				utftext += String.fromCharCode((c >> 6) | 192);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+			else {
+				utftext += String.fromCharCode((c >> 12) | 224);
+				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+
+		}
+
+		return utftext;
+	},
+
+	// private method for UTF-8 decoding
+	_utf8_decode : function (utftext) {
+		var string = "";
+		var i = 0;
+		var c = c1 = c2 = 0;
+
+		while ( i < utftext.length ) {
+
+			c = utftext.charCodeAt(i);
+
+			if (c < 128) {
+				string += String.fromCharCode(c);
+				i++;
+			}
+			else if((c > 191) && (c < 224)) {
+				c2 = utftext.charCodeAt(i+1);
+				string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+				i += 2;
+			}
+			else {
+				c2 = utftext.charCodeAt(i+1);
+				c3 = utftext.charCodeAt(i+2);
+				string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+				i += 3;
+			}
+
+		}
+
+		return string;
+	}
+
+}
--- a/libs/Oss/crypto.js
+++ b/libs/Oss/crypto.js
@ -0,0 +1,117 @@
+var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+let Crypto = {};
+var util = Crypto.util = {
+    rotl: function (n, b) {
+        return (n << b) | (n >>> (32 - b));
+    },
+    rotr: function (n, b) {
+        return (n << (32 - b)) | (n >>> b);
+    },
+    endian: function (n) {
+        if (n.constructor == Number) {
+            return util.rotl(n,  8) & 0x00FF00FF |
+                   util.rotl(n, 24) & 0xFF00FF00;
+        }
+        for (var i = 0; i < n.length; i++)
+            n[i] = util.endian(n[i]);
+        return n;
+    },
+    randomBytes: function (n) {
+        for (var bytes = []; n > 0; n--)
+            bytes.push(Math.floor(Math.random() * 256));
+        return bytes;
+    },
+    stringToBytes: function (str) {
+        var bytes = [];
+        for (var i = 0; i < str.length; i++)
+            bytes.push(str.charCodeAt(i));
+        return bytes;
+    },
+    bytesToString: function (bytes) {
+        var str = [];
+        for (var i = 0; i < bytes.length; i++)
+            str.push(String.fromCharCode(bytes[i]));
+        return str.join("");
+    },
+    stringToWords: function (str) {
+        var words = [];
+        for (var c = 0, b = 0; c < str.length; c++, b += 8)
+            words[b >>> 5] |= str.charCodeAt(c) << (24 - b % 32);
+        return words;
+    },
+    bytesToWords: function (bytes) {
+        var words = [];
+        for (var i = 0, b = 0; i < bytes.length; i++, b += 8)
+            words[b >>> 5] |= bytes[i] << (24 - b % 32);
+        return words;
+    },
+    wordsToBytes: function (words) {
+        var bytes = [];
+        for (var b = 0; b < words.length * 32; b += 8)
+            bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+        return bytes;
+    },
+    bytesToHex: function (bytes) {
+        var hex = [];
+        for (var i = 0; i < bytes.length; i++) {
+            hex.push((bytes[i] >>> 4).toString(16));
+            hex.push((bytes[i] & 0xF).toString(16));
+        }
+        return hex.join("");
+    },
+    hexToBytes: function (hex) {
+        var bytes = [];
+        for (var c = 0; c < hex.length; c += 2)
+            bytes.push(parseInt(hex.substr(c, 2), 16));
+        return bytes;
+    },
+    bytesToBase64: function (bytes) {
+        if (typeof btoa == "function") return btoa(util.bytesToString(bytes));
+        var base64 = [],
+            overflow;
+        for (var i = 0; i < bytes.length; i++) {
+            switch (i % 3) {
+                case 0:
+                    base64.push(base64map.charAt(bytes[i] >>> 2));
+                    overflow = (bytes[i] & 0x3) << 4;
+                    break;
+                case 1:
+                    base64.push(base64map.charAt(overflow | (bytes[i] >>> 4)));
+                    overflow = (bytes[i] & 0xF) << 2;
+                    break;
+                case 2:
+                    base64.push(base64map.charAt(overflow | (bytes[i] >>> 6)));
+                    base64.push(base64map.charAt(bytes[i] & 0x3F));
+                    overflow = -1;
+            }
+        }
+        if (overflow != undefined && overflow != -1)
+            base64.push(base64map.charAt(overflow));
+        while (base64.length % 4 != 0) base64.push("=");
+        return base64.join("");
+    },
+    base64ToBytes: function (base64) {
+        if (typeof atob == "function") return util.stringToBytes(atob(base64));
+        base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
+        var bytes = [];
+        for (var i = 0; i < base64.length; i++) {
+            switch (i % 4) {
+                case 1:
+                    bytes.push((base64map.indexOf(base64.charAt(i - 1)) << 2) |
+                               (base64map.indexOf(base64.charAt(i)) >>> 4));
+                    break;
+                case 2:
+                    bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0xF) << 4) |
+                               (base64map.indexOf(base64.charAt(i)) >>> 2));
+                    break;
+                case 3:
+                    bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0x3) << 6) |
+                               (base64map.indexOf(base64.charAt(i))));
+                    break;
+            }
+        }
+        return bytes;
+    }
+};
+Crypto.mode = {};
+export default Crypto;
--- a/libs/Oss/hmac.js
+++ b/libs/Oss/hmac.js
@ -0,0 +1,37 @@
+import Crypto from './crypto.js';
+/*!
+ * Crypto-JS v1.1.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2009, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+(function(){
+
+// Shortcut
+var util = Crypto.util;
+
+Crypto.HMAC = function (hasher, message, key, options) {
+
+    // Allow arbitrary length keys
+    key = key.length > hasher._blocksize * 4 ?
+          hasher(key, { asBytes: true }) :
+          util.stringToBytes(key);
+
+    // XOR keys with pad constants
+    var okey = key,
+        ikey = key.slice(0);
+    for (var i = 0; i < hasher._blocksize * 4; i++) {
+        okey[i] ^= 0x5C;
+        ikey[i] ^= 0x36;
+    }
+
+    var hmacbytes = hasher(util.bytesToString(okey) +
+                           hasher(util.bytesToString(ikey) + message, { asString: true }),
+                           { asBytes: true });
+    return options && options.asBytes ? hmacbytes :
+           options && options.asString ? util.bytesToString(hmacbytes) :
+           util.bytesToHex(hmacbytes);
+
+};
+
+})();
--- a/libs/Oss/sha1.js
+++ b/libs/Oss/sha1.js
@ -0,0 +1,82 @@
+import Crypto from './crypto.js';
+/*!
+ * Crypto-JS v1.1.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2009, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+(function(){
+
+// Shortcut
+var util = Crypto.util;
+
+// Public API
+var SHA1 = Crypto.SHA1 = function (message, options) {
+    var digestbytes = util.wordsToBytes(SHA1._sha1(message));
+    return options && options.asBytes ? digestbytes :
+           options && options.asString ? util.bytesToString(digestbytes) :
+           util.bytesToHex(digestbytes);
+};
+
+// The core
+SHA1._sha1 = function (message) {
+
+    var m  = util.stringToWords(message),
+        l  = message.length * 8,
+        w  =  [],
+        H0 =  1732584193,
+        H1 = -271733879,
+        H2 = -1732584194,
+        H3 =  271733878,
+        H4 = -1009589776;
+
+    // Padding
+    m[l >> 5] |= 0x80 << (24 - l % 32);
+    m[((l + 64 >>> 9) << 4) + 15] = l;
+
+    for (var i = 0; i < m.length; i += 16) {
+
+        var a = H0,
+            b = H1,
+            c = H2,
+            d = H3,
+            e = H4;
+
+        for (var j = 0; j < 80; j++) {
+
+            if (j < 16) w[j] = m[i + j];
+            else {
+                var n = w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16];
+                w[j] = (n << 1) | (n >>> 31);
+            }
+
+            var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
+                     j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
+                     j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
+                     j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
+                              (H1 ^ H2 ^ H3) - 899497514);
+
+            H4 =  H3;
+            H3 =  H2;
+            H2 = (H1 << 30) | (H1 >>> 2);
+            H1 =  H0;
+            H0 =  t;
+
+        }
+
+        H0 += a;
+        H1 += b;
+        H2 += c;
+        H3 += d;
+        H4 += e;
+
+    }
+
+    return [H0, H1, H2, H3, H4];
+
+};
+
+// Package private blocksize
+SHA1._blocksize = 16;
+
+})();
--- a/libs/Oss/upload.js
+++ b/libs/Oss/upload.js
@ -0,0 +1,65 @@
+import Crypto from './crypto.js';
+import './hmac.js';
+import './sha1.js';
+import Util from '@/libs/util'
+import {Base64} from './base64.js';
+
+let date=new Date()
+date=date.setHours(date.getHours() + 1)
+let extime=""+new Date(date).toISOString()
+var policyText = {
+	"expiration": extime, //设置该Policy的失效时间，超过这个失效时间之后，就没有办法通过这个policy上传文件了
+	"conditions": [
+		["content-length-range", 0, 1024*1024*100] // 设置上传文件的大小限制 
+	]
+};	
+var config={
+	accessid:'LTAI4FzqQHnk4rozqLZ8jCNj',
+	accesskey:'mveW7B1OyFoKUkHm8WsxmrjHmkJWHq',
+	osshost:'https://huoran.oss-cn-shenzhen.aliyuncs.com',
+	policyBase64:Base64.encode(JSON.stringify(policyText))
+}
+var message = config.policyBase64;
+var bytes = Crypto.HMAC(Crypto.SHA1, message, config.accesskey, { asBytes: true }) ;
+var signature = Crypto.util.bytesToBase64(bytes);
+var timetamp = new Date().getTime();
+function random_string(len) {
+　　len = len || 32;
+　　var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';   
+　　var maxPos = chars.length;
+　　var pwd = '';
+　　for (let i = 0; i < len; i++) {
+	　　pwd += chars.charAt(Math.floor(Math.random() * maxPos));
+	}
+	return pwd;
+}
+var OSS={
+	name:'aliyun',
+	host:config.osshost,
+	accessid:config.accessid,
+	signature:signature,
+	policyBase64:config.policyBase64,
+}
+export default function(tempFilePaths, callback) {
+	const fileName = Date.now() + '.' + Util.getFileExt(tempFilePaths)
+	uni.uploadFile({
+　　		url: OSS.host,
+　　		filePath: tempFilePaths,
+		fileType: '',
+		name: 'file',
+		formData: {
+		name: fileName,
+		key: fileName,//文件名
+　		policy: OSS.policyBase64, // 输入你获取的的policy
+		OSSAccessKeyId: OSS.accessid, // 输入你的AccessKeyId
+		success_action_status: '200', // 让服务端返回200,不然，默认会返回204
+		signature: OSS.signature, // 输入你获取的的signature
+	},
+	success: (res) => {
+		callback(OSS.host + '/' + fileName)
+	},
+	fail: (res) => {
+		console.log(res);
+	}
+})
+};
--- a/libs/mtj-wx-sdk.config.js
+++ b/libs/mtj-wx-sdk.config.js
@ -1,39 +0,0 @@
-/**
- * @file 百度移动统计配置文件
- */
-
-module.exports = {
-    /**
-     * 从百度移动统计获取的AppKey
-     * @type {string}
-     */
-    appKey: 'ce2fa79380',
-
-    /**
-     * 是否使用了插件
-     * @type {boolean}
-     */
-    hasPlugin: false,
-
-    /**
-     * 是否获取当前的地理位置和速度信息
-     * @type {boolean}
-     */
-    getLocation: false,
-
-    /**
-     * 是否获取组件滚动信息
-     * @type {boolean}
-     */
-    getComponentScroll: false,
-    /**
-     * 是否开启了A/B 测试
-     * @type {boolean}
-     */
-    hasABTest: false,
-    /**
-     * 是否开启热力图功能
-     * @type {boolean}
-     */
-    hasHeatmap: false,
-};
--- a/libs/mtj-wx-sdk.js
+++ b/libs/mtj-wx-sdk.js
--- a/libs/uma.js
+++ b/libs/uma.js
@ -1,20 +0,0 @@
-
-// #ifdef MP-WEIXIN
-import uma from 'umtrack-wx';
-uma.init({
-	appKey: '64cc98d5a1a164591b62da3e', // 由友盟分配的APP_KEY
-	useOpenid: true,
-    // 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
-    // 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid
-	autoGetOpenid: true,
-    // 使用openid进行统计时，是否授权友盟自动获取Openid，
-    // 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
-	debug: true,// 是否打开调试模式
-    uploadUserInfo: true, // 自动上传用户信息，设为false取消上传，默认为false
-	enableVerify: true
-});
-uma.install = function(Vue) {
-	Vue.prototype.$uma = uma;
-}
-export default uma;
-// #endif
--- a/libs/util.js
+++ b/libs/util.js
@ -121,4 +121,8 @@ export default {
 	removeTag(str) {
 		return str.replace(/(<[^>]+>)|((&nbsp;)+)/g , '')
 	},
+    // 传入文件名获取文件后缀
+    getFileExt(fileName) {
+        return fileName.substring(fileName.lastIndexOf(".") + 1);
+    },
 }
--- a/main.js
+++ b/main.js
@ -3,13 +3,10 @@
 import Vue from 'vue'
 import App from './App'
 import util from '@/libs/util'
-import uma from './libs/uma'
 import share from './libs/share'
-import mtjWxSdk from './libs/mtj-wx-sdk'

 Vue.config.productionTip = false
 Vue.prototype.$util = util
-Vue.use(uma)
 Vue.mixin(share)

 App.mpType = 'app'
--- a/order/registeredActivity/registeredActivity.vue
+++ b/order/registeredActivity/registeredActivity.vue
@ -0,0 +1,299 @@
+<template>
+	<view>
+		<view class="filter">
+			<uni-search-bar class="search" radius="30" placeholder="请输入活动名称" v-model="keyword" clearButton="auto" cancelButton="none" />
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
+		</view>
+		
+		<ul class="tab-wrap">
+			<view class="tab">
+				<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
+			</view>
+			
+			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
+				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.value}" @click="tabChange(tab.value)">{{ tab.title }}</li>
+			</scroll-view>
+		</ul>
+		
+		<ul class="list">
+			<li v-for="(item, i) in list" :key="i" @click="toDetail(item)">
+				<image class="pic" src="@/static/image/info-bg.jpg"></image>
+				<view class="right">
+					<view class="name">测试名称</view>
+					<view class="meta">时间：23323</view>
+					<view class="meta">主办方：23323</view>
+					<view class="meta">12/343人已报名</view>
+				</view>
+			</li>
+		</ul>
+		
+		<filter-popup ref="filter" showCategory :data="filters" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
+	</view>
+</template>
+
+<script>
+	import { tagsList, listOfGoods, productTypeList, shoppingCartList } from '@/apis/modules/product.js'
+	export default {
+		data() {
+			return {
+				popup: false,
+				//筛选表单数据
+				filters: [
+					{
+						children: false,//是否有子项
+						title: "产品类型",
+						key: "productType", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
+						isRadio: true, //是否单选 否则多选
+						data: [],
+					},
+					{
+						children: false,//是否有子项
+						title: "官方精选",
+						key: "selection", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
+						data: [
+							{
+								value: 1,
+								title: '官方精选'
+							}
+						],
+					},
+					{
+						children: false,//是否有子项
+						title: "产品标签",
+						key: "tagId", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
+						isRadio: true, //是否单选 否则多选
+						data: [],
+					},
+				],
+				filterForm: {
+					productType: [],
+					selection: [],
+					tagId: []
+				},
+				form: {
+					categoryId: '',
+					professionalCategoryId: '',
+					professionalId: '',
+					productType: '',
+					selection: '',
+					tagId: ''
+				},
+				tagId: '',
+				curTab: '',
+				tabs: [],
+				scrollLeft: 0,
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				searchTimer: null,
+				sort: 0,
+				keyword: '',
+				list: [],
+				page: 1,
+				pageSize: 10,
+				total: 0,
+				cartNum: '',
+				productTypeName: '',
+				tagName: '',
+				categoryName: '',
+			}
+		},
+		watch: {
+			keyword () {
+				clearTimeout(this.searchTimer)
+				this.searchTimer = setTimeout(() => {
+					this.initList()
+				}, 500)
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			const { tagId, tagsName } = options
+			this.form.tagId = +tagId || ''
+			if (tagId) {
+				this.filterForm.tagId = [+tagId]
+				// this.tagName = tagsName
+			}
+			
+			this.keyword = options.keyword || ''
+			this.page = 1
+			this.getList()
+			this.getFilter()
+			this.getShopCart()
+		},
+		methods: {
+			getList() {
+				listOfGoods({
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					sort: 0,
+					isShelves: 0,
+					hotTag: this.form.tagId ? 2 : 1,
+					...this.form,
+					productName: this.keyword,
+					productType: this.curTab
+				}).then(({ page }) => {
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					const list = page.records
+					list.map(e => {
+						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
+					})
+					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === page.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+				}).catch(e => {})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 获取购物车数量
+			getShopCart() {
+				shoppingCartList({
+					pageNum: 1,
+					pageSize: 1000,
+				}).then(({ data }) => {
+					this.total = data.total
+				}).catch(e => {})
+			},
+			// 筛选
+			getFilter() {
+				// 产品类型
+				productTypeList().then(res => {
+					res.typeList.forEach(e => {
+						e.value = e.typeId
+						e.title = e.typeName
+					})
+					this.tabs = res.typeList
+					this.filters[0].data = res.typeList
+				}).catch(e => {})
+				
+				// 产品标签
+				tagsList().then(res => {
+					res.tagsList.forEach(e => {
+						e.value = e.tagsId
+						e.title = e.tagsName
+					})
+					this.filters[2].data = res.tagsList
+				}).catch(e => {})
+			},
+			// 筛选确定回调
+			subFinsh(val) {
+				const { productType, selection, tagId, categoryId, professionalCategoryId, professionalId, categoryName } = val
+				this.form = {
+					categoryId: categoryId || '',
+					professionalCategoryId: professionalCategoryId || '',
+					professionalId: professionalId || '',
+					productType: productType.length ? productType[0] : '',
+					selection: selection.length ? selection[0] : '',
+					tagId: tagId.length ? tagId[0] : ''
+				}
+				this.categoryName = categoryName || ''
+				this.productTypeName = this.form.productType ? this.filters[0].data.find(e => e.value == this.form.productType).title : ''
+				this.tagName = this.form.tagId ? this.filters[2].data.find(e => e.value == this.form.tagId).title : ''
+				this.initList()
+			},
+			// 删除学科专业已选
+			delCategory() {
+				this.$refs.filter.category = []
+				this.$refs.filter.categoryName = ''
+				this.$refs.filter.categoryId = ''
+				this.$refs.filter.professionalCategoryId = ''
+				this.$refs.filter.professionalId = ''
+				this.form.categoryId = ''
+				this.form.professionalCategoryId = ''
+				this.form.professionalId = ''
+				this.categoryName = ''
+				this.initList()
+			},
+			// 删除产品类型已选
+			delProductType() {
+				this.filterForm.productType = []
+				this.form.productType = ''
+				this.productTypeName = ''
+				this.initList()
+			},
+			// 删除官方精选已选
+			delSelection() {
+				this.filterForm.selection = []
+				this.form.selection = ''
+				this.initList()
+			},
+			// 删除产品标签已选
+			delTag() {
+				this.filterForm.tagId = []
+				this.form.tagId = ''
+				this.tagName = ''
+				this.initList()
+			},
+			// tab切换
+			tabChange(id) {
+				this.curTab = id
+				this.initList()
+			},
+			// 跳转详情
+			toDetail(item) {
+				this.$util.to(`../activityDetail/activityDetail?id=${item.mallId}`)
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.tab-wrap {
+	display: flex;
+	.tab-scroll {
+		width: calc(100% - 100rpx);
+		white-space: nowrap;
+		li {
+			display: inline-block;
+		}
+	}
+}
+.list {
+	li {
+		display: flex;
+		padding: 20rpx;
+		margin: 16rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+	}
+	.pic {
+		width: 240rpx;
+		height: 180rpx;
+		margin-right: 20rpx;
+		border-radius: 8px;
+	}
+	.name {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333;
+	}
+	.meta {
+		margin: 10rpx 0;
+		font-size: 26rpx;
+		color: #999;
+	}
+}
+</style>
--- a/pages.json
+++ b/pages.json
@ -69,6 +69,14 @@
 						"navigationBarTitleText" : "活动详情",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "registeredActivity/registeredActivity",
+					"style" : 
+					{
+						"navigationBarTitleText" : "已报名活动",
+						"enablePullDownRefresh" : true
+					}
 				}
            ]
 		},
@ -130,6 +138,14 @@
 						"navigationBarTitleText" : "用户名修改",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "auth/auth",
+					"style" : 
+					{
+						"navigationBarTitleText" : "企业认证",
+						"enablePullDownRefresh" : false
+					}
 				}
            ]
 		}
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@ -30,7 +30,7 @@
 						</view>
 						<view class="text ell">我的关注</view>
 					</li>
-					<li @click="toPage('')">
+					<li @click="toPage('/order/registeredActivity/registeredActivity')">
 						<view class="icon">
 							<image src="@/static/image/info-bg.jpg"></image>
 						</view>
@ -70,7 +70,7 @@
 				<view class="title">工作台</view>
 				
 				<ul class="func">
-					<li @click="toPage('')">
+					<li @click="toPage('/team/auth/auth')">
 						<view class="icon">
 							<image src="@/static/image/info-bg.jpg"></image>
 						</view>
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@ -0,0 +1,109 @@
+<template>
+	<view class="page">
+		<view class="block">
+			<view class="form-list">
+				<view class="line with-arrow">
+					<view class="name">幼儿园名称</view>
+					<view class="val">
+						<input type="text" placeholder="请输入幼儿园名称" />
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+				<view class="line with-arrow">
+					<view class="name">统一社会信用代码</view>
+					<view class="val">
+						<input type="text" placeholder="请输入证件号码" />
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+				<view class="line with-arrow">
+					<view class="name">法人</view>
+					<view class="val">
+						<input type="text" placeholder="请输入法人" />
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="block">
+			<view class="title">上传营业执照</view>
+			<image class="credential" :src="yy" mode="widthFix" @click="uploadYY"></image>
+		</view>
+		
+		<view class="block">
+			<view class="title">上传办学许可证</view>
+			<image class="credential" src="https://occupationlab.com/images/preschoolEdu/credentials2.png" mode="widthFix"></image>
+		</view>
+		
+		<view class="btn-wrap">
+			<view class="btn" @click="submit">认证信息</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { my } from '@/apis/modules/parner.js'
+	import OSS from '@/libs/Oss/upload'
+	export default {
+		data() {
+			return {
+				img: '',
+				yy: 'https://occupationlab.com/images/preschoolEdu/credentials1.png'
+			}
+		},
+		onShow() {
+			this.getInfo()
+		},
+		methods: {
+			// 获取个人信息
+			getInfo() {
+				const { partnerId, teamId } = uni.getStorageSync('team')
+				my({
+					partnerId,
+					teamId
+				}).then(({ my }) => {
+					this.info = my.info
+				}).catch(e => {})
+			},
+			// 上传营业执照
+			uploadYY() {
+				const that = this
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths[0];
+						OSS(tempFilePaths, (name) => {
+							that.yy = name
+						})
+					}
+				});
+			},
+			submit() {
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	padding-bottom: 170rpx;
+	-webkit-overflow-scrolling: touch;
+}
+.avatar {
+	width: 80rpx;
+	height: 80rpx;
+	border: 0;
+	border-radius: 50%;
+}
+.block {
+	padding: 24rpx;
+}
+.title {
+	margin-bottom: 20rpx;
+	font-size: 28rpx;
+}
+.credential {
+	width: 100%;
+}
+</style>
--- a/team/setting/setting.vue
+++ b/team/setting/setting.vue
@ -1,8 +1,8 @@
 <template>
 	<view>
 		<uni-list>
+			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="accountIcon" title="姓名" :rightText="info.account" clickable @click="toPage('../userName/userName')" />
 			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="phoneIcon" title="手机号" :rightText="info.phone" clickable @click="toPage('../phone/phone')" />
-			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="accountIcon" title="用户名" :rightText="info.account" clickable @click="toPage('../account/account')" />
 		</uni-list>
 		
 		<view class="logout" @click="logout">退出登录</view>
--- a/team/userName/userName.vue
+++ b/team/userName/userName.vue
@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<view class="input">
-			<uni-easyinput v-model.trim="account" placeholder="请输入用户名"></uni-easyinput>
+			<uni-easyinput v-model.trim="account" placeholder="请输入姓名"></uni-easyinput>
 		</view>
 		<button type="primary" @click="submit">确认</button>
 	</view>
@ -22,7 +22,7 @@
 		methods: {
 			submit() {
 				const { account } = this
-				if(!account) return this.$util.errMsg('请输入用户名')
+				if(!account) return this.$util.errMsg('请输入姓名')
 				changeAccount(account).then(res => {
 					this.$util.sucMsg('修改成功！')
 					setTimeout(() => {